Justin Bronn
25cfbd6d66
gis: Changed the inches attribute name from in
(a Python reserved keyword) to inch
. Thanks, andre_pl.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-26 01:03:24 +00:00
Justin Bronn
b33e709981
gis: Removed the sites
module and use the site
instance from django.contrib.admin
instead.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-23 22:24:16 +00:00
Justin Bronn
bfe714f014
gis: Fixed #7873 , GEOSGeometry
equivalence comparison with None
should not raise an exception. Thanks, Denis.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22 02:43:47 +00:00
Justin Bronn
825d6edd69
gis: gdal: Features may now be fetched from OGR layers that do not support random access reading, but no more negative indexes are allowed; cleaned up OGRGeomType
; moved test vector data into its own directory.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22 01:10:59 +00:00
Justin Bronn
7011fc6d3c
gis: Now use ctypes.util.find_library
to get the C library names. This is preferrable to manually specifying the different library naming schemes used by different platforms/distributions.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 21:30:46 +00:00
Justin Bronn
fff69c18c1
gis: Removed vestige code containing references to the now defunct 'NoField' database creation type and Field.get_placeholder
(which should only exist on the GeometryField
subclass).
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 01:48:23 +00:00
Justin Bronn
2995f4e509
gis: Added the geographic-enabled forms and admin modules.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 14:17:24 +00:00
Justin Bronn
149e731c3c
gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.
...
This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 13:30:47 +00:00
Justin Bronn
5bf3565a26
gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13 14:31:09 +00:00
Justin Bronn
314d19db66
gis: Fixed #7705 ; forgot to import get_field_name
from the ctypes prototypes. Thanks, Denis.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-10 20:33:59 +00:00
Justin Bronn
6d77419deb
gis: Fixed bug in GeoQuery.get_default_columns
; forgot to make Oracle spatial lookup terms structure a dictionary.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-08 18:46:09 +00:00
Justin Bronn
822a1259f6
gis: Fixed #7619 . Added support Google Maps markers (GMarker
) and events (GEvent
). Thanks, Ludwig Brinckmann.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-05 22:10:33 +00:00
Justin Bronn
ccd5f52ee7
gis: Fixed #7579 ; no longer attempt to transform input geometries if GeometryField
has its SRID set to -1.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-05 16:59:51 +00:00
Justin Bronn
597b07117a
gis: Revised changes to GeoWhereNode
to reduce code duplication. Thanks, Malcolm.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-05 15:40:55 +00:00
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