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
Justin Bronn
c703452841
gis: geos: Fixed bug in transform
where coordinate sequence pointer was not after transformation (and added tests). Thanks robotika.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-08 17:36:43 +00:00
Justin Bronn
ead0dad735
gis: geos: Fixed declaration of geos_version
to explicitly set restype to c_char_p
due to incompatibilities with 64-bit platforms. Thanks jlivni.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-08 14:42:37 +00:00
Justin Bronn
06f2ddeb51
gis: Fixed #6440 . Removed degree conversion from Distance
-- should not have been placed here because it is a spherical conversion factor in radians (not meters).
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-28 16:31:41 +00:00
Justin Bronn
00292ad02e
gis: Merged revisions 6990-7043 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-28 15:35:46 +00:00
Justin Bronn
398eca3fb2
gis: Added the extent
method to GeoQuerySet
; moved various spatial-backend settings into the SpatialBackend
container class.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-22 01:22:27 +00:00
Justin Bronn
feebe39429
gis: Fixed #6289 (added extra_context
keyword to GoogleMap
). Thanks omat & arien.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-18 16:49:51 +00:00
Justin Bronn
8da13e60c2
gis: Fixed #6357 , and added a validator to WKTField
.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-18 16:38:51 +00:00
Justin Bronn
3dd6b422ca
gis: LayerMapping
: Fixed bug that would occur when mapping OFTReal
fields with precision > 0 to an IntegerField
.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-18 15:52:37 +00:00
Justin Bronn
730b1f6d7a
gis: LayerMapping
: Added the fid_range
and step
keywords to save()
; moved the silent
, strict
, and pipe
(now stream
) keywords from __init__()
to save()
.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-10 17:11:02 +00:00
Justin Bronn
5655cf1b2a
gis: gdal: GeometryCollection.add()
now accepts other collections, and associated tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-09 19:42:23 +00:00
Justin Bronn
298074d5b8
gis: gdal: Fixed Driver and DataSource bug reported by David Hancock in django-users and reproduced by tlp.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-06 22:20:39 +00:00
Justin Bronn
1d5e689af2
gis: gdal: Now supports the official GDAL 1.5 binaries for Windows, greatly simplifying installation for that platform; implemented STDCALL aliases for OSR routines that have inconsistent calling convention via the std_call
function; removed unused prototypes module code.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-04 06:41:13 +00:00
Justin Bronn
b11172e4e7
gis: LayerMapping
: Improved the internals (i.e., checking every feature in OGR Layer is no longer needed, removed unnecessary class constants); added real support ForeignKey
model fields; added field_types
property to Layer
; fixed county shapefile because of Harris County, Georgia.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-03 19:02:18 +00:00
Justin Bronn
7e322b5908
gis: Merged revisions 6920-6989 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-02 16:57:53 +00:00
Justin Bronn
ef0f46f1d0
gis: LayerMapping
: Added the unique
keyword parameter and tests for the transform
keyword and geometry collection conversion.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-29 07:48:08 +00:00
Justin Bronn
387e6cca92
gis: lowered test transformation precision due to variations in updated PROJ and GDAL versions (i.e., tests run for GDAL 1.5 and PROJ 4.6.0).
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-27 21:44:33 +00:00