mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity
2,986 Commits 29 Branches 451 Tags
Commit Graph

2986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bronn
bc3d6b4908 gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-04 20:16:22 +00:00
Justin Bronn
aef8a8305d gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-7698,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 15:11:55 +00:00
Justin Bronn
9fcc6c305a gis: Fixed #7540 -- fixed the GeoJSON regex to accept minus signs. Thanks, Kenichi Ueda. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 14:31:03 +00:00
Justin Bronn
f83b8efefd gis: Added the ogrinspect management command. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-19 20:01:29 +00:00
Justin Bronn
6b12a135d6 gis: Fixed spatial aggregates when an ordering was specified (thanks ingenieroariel); added bboverlaps to MySQL lookup types for API consistency. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-19 06:00:13 +00:00
Justin Bronn
2eeb84bd55 gis: Improvements to get_srid_info, including raising no exception when the srid == -1 and making the error checking and message more robust; tweaked testing tolerance in distapp for those running older versions of GEOS. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 16:58:12 +00:00
Justin Bronn
6fdd9254e6 gis: gdal: Fixed #7434 (no real defect, just clarified how to disable GDAL); fixed != operator and added support for 'Unknown on OGRGeomType`. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 16:39:36 +00:00
Justin Bronn
842dae0ed5 gis: Merged revisions 7574-7583,7585-7586,7590-7602,7614-7615,7619-7625,7629,7632-7636 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 00:34:17 +00:00
Justin Bronn
4ec80c4333 gis: Refactor of the GeoQuerySet; new features include: 
(1) Creation of internal API that eases generation of `GeoQuerySet` methods.
 (2) `GeoQuerySet.distance` now returns `Distance` objects instead of floats.
 (3) Added the new `GeoQuerySet` methods: `area`, `centroid`, `difference`, `envelope`, `intersection`, `length`, `make_line`, `mem_size`, `num_geom`, `num_points`, `perimeter`, `point_on_surface`, `scale`, `svg`, `sym_difference`, `translate`, `union`.
 (4) The `model_att` keyword may be used to customize the attribute that `GeoQuerySet` methods attach output to.
 (5) Geographic distance lookups and `GeoQuerySet.distance` calls now use `ST_distance_sphere` by default (performance benefits far outweigh small loss in accuracy); `ST_distance_spheroid` may still be used by specifying an option.
 (6) `GeoQuerySet` methods may now operate accross ForeignKey relations specified via the `field_name` keyword (but this does not work on Oracle).
 (7) `Area` now has the same units of measure as `Distance`.

Backward Incompatibilites:
 * The aggregate union method is now known as `unionagg`.
 * The `field_name` keyword used for `GeoQuerySet` methods may no longer be specified via positional arguments.
 * `Distance` objects returned instead of floats from `GeoQuerySet.distance`.
 * `ST_Distance_sphere` used by default for geographic distance calculations.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 19:48:57 +00:00
Justin Bronn
eb30cad66a gis: Modified the Oracle database backend so that the input size of parameters may be customized (this was preventing the gis branch from working because Oracle's WKT stored procedures require CLOB rather than NCLOB as input). Ian Kelly has approved this patch; notwithstanding any further concerns, its functionality should appear in trunk sometime in the future. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 17:28:21 +00:00
Justin Bronn
a245b72d67 gis: Merged revisions 7545-7546,7548-7561,7563-7565,7567-7569 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-04 17:37:02 +00:00
Justin Bronn
b4a687b189 gis: Disabled query counting test in relatedapp because of its brittleness (number of queries may depend on external factors). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-04 17:25:55 +00:00
Justin Bronn
acfc49ed4e gis: gdal: Made error message when opening an invalid DataSource more clear. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-04 17:24:08 +00:00
Justin Bronn
462d731423 gis: Went through and cleaned up ogrinspect code and added features provided in patch from springmeyer (thanks); add_postgis_srs requires GDAL, so modified utils imports accordingly. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-04 17:21:54 +00:00
Justin Bronn
09ee2359cf gis: Added the precision_wkt utility; add_postgis_srs may now take WKT/PROJ.4 strings and integer SRIDs. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-22 21:52:03 +00:00
Justin Bronn
5fd838c4dc gis: Merged revisions 7526,7534-7539 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-18 18:27:22 +00:00
Justin Bronn
c3f48762fc gis: Merged revisions 7514,7520-7521 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-10 16:18:22 +00:00
Justin Bronn
579c9d4567 gis: Fixed _post_create_sql hook to not generate additional SQL for fields belonging to a parent model via model inheritance. Thanks, robotika. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-02 18:38:06 +00:00
Justin Bronn
57c700d550 gis: Fixed #7126 (with tests); moved GeoQuery and GeoWhereNode into sql submodule; the GeoQuerySet.transform may now be used on geometry fields related via foreign key. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-01 18:17:50 +00:00
Justin Bronn
5922dabea0 gis: Merged revisions 7499,7501-7502,7504,7509-7510 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-01 00:32:50 +00:00
Justin Bronn
e5b52f90f0 gis: Merged revisions 7485-7491,7493-7497 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-28 14:08:46 +00:00
Justin Bronn
a125a1c9b6 gis: Forgot to include Oracle relate patch with the other qsrf changes. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 17:41:42 +00:00
Justin Bronn
e973fea91c gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from trunk. 
This includes all necessary patches for compatibility with queryset-refactor.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 17:17:04 +00:00
Justin Bronn
5456919782 gis: The WKTAdaptor needs the SRID for Oracle; now test geodetic dwithin lookups on Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-26 00:36:15 +00:00
Justin Bronn
c03a030fd3 gis: Fixed GEOS tests for those still running 3.0.0RC4. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-25 23:52:41 +00:00
Justin Bronn
115d4170ae gis: Fixed bug where extra parameters were passed into SQL for dwithin lookups for geodetic fields; now degree values (no Distance objects) may be used with dwithin lookups. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-24 23:01:04 +00:00
Justin Bronn
1731135661 gis: Merged revisions 7408-7415,7420-7424,7435 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-22 18:27:02 +00:00
Justin Bronn
f49c770b2d gis: Updated KML tests for PostGIS 1.3.3 and GDAL tests to not perform close_rings test for versions 1.4.1 and below. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-22 18:14:29 +00:00
Justin Bronn
e1d84dd4fb gis: Applied DRY to Oracle and MySQL geometry adaptors; the PostGISAdaptor now stores WKB in raw string form to support pickling; added an equivalence method to all adaptors. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-07 22:20:58 +00:00
Justin Bronn
55ea575548 gis: gdal: Added the clone keyword to OGRGeometry.transform; removed unnecessary __nonzero__ function from SpatialReference. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-07 21:43:36 +00:00
Justin Bronn
b0291347db gis: Merged revisions 7355-7403 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-07 20:29:36 +00:00
Justin Bronn
147bd6ac36 gis: geos: GEOSGeometry objects may now be pickled; added the clone keyword to transform which returns a cloned transformed geometry rather than transforming in-place. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-07 20:15:04 +00:00
Justin Bronn
4a636ec3a3 gis: GoogleMap: The Google Maps JavaScript API is now used for automatic zoom level determination; the center_lat and center_lon keywords have been removed. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-04 12:57:19 +00:00
Justin Bronn
17baee8789 gis: Added the add_postgis_srs utility to ease the creation of spatial_ref_sys table entries. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-04 12:32:58 +00:00
Justin Bronn
282bccfbc1 gis: Fixed geographic models produced by inspectdb. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-01 22:40:32 +00:00
Jeremy Dunck
f273b371a4 [gis] Tweaked layermapping to note updates to unique'd models. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-30 21:45:39 +00:00
Justin Bronn
2efc34dc5e gis: Merged revisions 7280-7353 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-23 17:18:58 +00:00
Justin Bronn
b0a895f9e8 gis: Merged revisions 7181-7277 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 04:05:09 +00:00
Justin Bronn
34df2c0da9 gis: LayerMapping: OGR string fields may now be coerced into Django IntegerField; added support for more Django field types. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-10 21:13:52 +00:00
Justin Bronn
ae0e583510 gis: Fixed #6746 by marking safe GoogleMap internal XHTML/JavaScript; added support for GPolygon and GPolyline overlays via the polygons and polylines keywords; the zoom keyword may now take a geometry for automatic zoom level determination; *.pyc files are now ignored in django.contrib.gis modules. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-10 20:45:51 +00:00
Justin Bronn
22e016ff6c gis: Merged revisions 7105-7168 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-28 21:24:51 +00:00
Justin Bronn
0b52413cc9 gis: Added geographic introspection capabilities for PostGIS and MySQL; fixed typo in GeoQuerySet (Thanks seanl). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-28 21:06:27 +00:00
Justin Bronn
6fef560d97 gis: Fixed bug in GeoQuerySet.distance caused by SQL substitution that shouldn't be done there (thanks robotika); an exception is no longer raised when trying to import the spatial metadata models on backends that do not support them (e.g., MySQL). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-20 21:15:43 +00:00
Justin Bronn
bdab7abe2c gis: gdal: Fixed new _version_info definition for win32 platforms; made GeoJSON regex more strict. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-18 03:03:25 +00:00
Justin Bronn
ccf9baca86 gis: geos: Added GeoJSON input/output support for GEOSGeometry (requires GDAL 1.5+); Polygons may now be instantiated with tuples of coordinates instead of only LinearRing instances; added extent property; added coords property alias for tuple (and added tuple for GeometryCollection); made small optimizations to KML and coordinate array generators. Small GDAL protochange that didn't make last commit: get_envelope is now generated w/the previously unused env_func. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-14 16:33:16 +00:00
Justin Bronn
6a692e8031 gis: gdal: Fixed GDAL version string parsing for development versions; GEOJSON constant now in root module; added extent property and coords property alias for tuple; added x,y,z properties for OGR LineStrings. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-14 16:05:44 +00:00
Justin Bronn
d88c9ac644 gis: gdal: Added support for GeoJSON input/output in OGRGeometry. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-13 00:38:36 +00:00
Justin Bronn
21a019681c gis: Fixed 6414, and applied DRY to spatial backend internals. Changes include: 
(1) Support for distance calculations on geometry fields with geodetic coordinate systems (e.g., WGS84, the default).
 (2) The `get_db_prep_save` and  `get_db_prep_lookup` have been moved from the spatial backends to common implementations in `GeometryField`.
 (3) Simplified SQL construction for `GeoQuerySet` methods.
 (4) `SpatialBackend` now contains all spatial backend dependent settings.


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-11 02:25:01 +00:00
Justin Bronn
d06e33a54d gis: Merged revisions 7044-7102 via svnmerge from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-08 20:57:56 +00:00
Justin Bronn
40e0a964ea gis: gdal: SpatialReference objects may now be constructed with PROJ.4 strings without specifying a keyword. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-08 19:10:00 +00:00