Changeset 7138

Timestamp:

02/20/08 15:15:43 (5 months ago)

Author:

jbronn

Message:

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).

Files:

• django/branches/gis/django/contrib/gis/db/models/fields/__init__.py (modified) (4 diffs)
• django/branches/gis/django/contrib/gis/db/models/query.py (modified) (2 diffs)
• django/branches/gis/django/contrib/gis/models.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/distapp/data.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/distapp/tests.py (modified) (3 diffs)

django/branches/gis/django/contrib/gis/db/models/fields/__init__.py

@@ -13 +13 @@
-try:
-    from django.contrib.gis.models import SpatialRefSys
-NotImplemented
+Import
-    SpatialRefSys = None
-
@@ -22 +22 @@
-    # The OpenGIS Geometry name.
-    _geom = 'GEOMETRY'
+
+    # Geodetic units.
+    geodetic_units = ('Decimal Degree', 'degree')
-
-    def __init__(self, srid=4326, spatial_index=True, dim=2, **kwargs):
@@ -83 +86 @@
-        then 1000 would be returned.
-        """
+        
-        if isinstance(dist, Distance):
-('Decimal Degree', 'degree')
+self.geodetic_units
-                # Spherical distance calculation parameter should be in meters.
-                dist_param = dist.m
@@ -94 +98 @@
-
-        # Sphereical distance query; returning meters.
-== 'degree'
+in self.geodetic_units
-            return [gqn(self._spheroid), dist_param]
-        else:

django/branches/gis/django/contrib/gis/db/models/query.py

@@ -5 +5 @@
-from django.db.models.fields import FieldDoesNotExist
-from django.utils.datastructures import SortedDict
-
+, PointField
-# parse_lookup depends on the spatial database backend.
-from django.contrib.gis.db.backend import gqn, parse_lookup, SpatialBackend
-
+, Point
-
-# Shortcut booleans for determining the backend.
@@ -280 +280 @@
-        where, params = geo_field.get_db_prep_lookup('distance_lte', (geom, 0))
-        if oracle:
-
+
+
-            tolerance = kwargs.get('tolerance', 0.05)
-
-
-
-
-
-
-
-
-
+
+
-            if len(where) == 3:
+                # Spherical distance calculation was requested (b/c spheroid 
+                # parameter was attached) However, the PostGIS ST_distance_spheroid() 
+                # procedure may only do queries from point columns to point geometries
+                # some error checking is required.
+                if not isinstance(geo_field, PointField): 
+                    raise TypeError('Spherical distance calculation only supported on PointFields.')
+                if not isinstance(GEOSGeometry(params[0].wkb), Point):
+                    raise TypeError('Spherical distance calculation only supported with Point Geometry parameters')
+
-                # Call to distance_spheroid() requires the spheroid as well.
-dsql
-
-dsql
+where[0]
+
+where[0]
-            dist_select = {'distance' : dist_sql}
-
+, params=params
-
-    def extent(self, field_name=None):

django/branches/gis/django/contrib/gis/models.py

@@ -215 +215 @@
-    from django.contrib.gis.db.backend.oracle.models import GeometryColumns, SpatialRefSys
-else:
-raise NotImplementedError('No SpatialRefSys or GeometryColumns models for backend: %s' % settings.DATABASE_ENGINE)
+pass

django/branches/gis/django/contrib/gis/tests/distapp/data.py

@@ -9 +9 @@
-             ('Hobart', 147.33, -42.8827),
-             ('Adelaide', 138.6, -34.9258),
+             ('Hillsdale', 151.231341, -33.952685),
-             )
-

django/branches/gis/django/contrib/gis/tests/distapp/tests.py

@@ -3 +3 @@
-
-from django.contrib.gis.gdal import DataSource
-
+, LineString
-from django.contrib.gis.measure import D # alias for Distance
-from django.contrib.gis.db.models import GeoQ
@@ -36 +36 @@
-
-        self.assertEqual(10, SouthTexasCity.objects.count())
-0
+1
-
-    def test02_dwithin(self):
@@ -57 +57 @@
-                     70870.188967, 165337.758878, 102128.654360, 
-                     139196.085105]
+
+        # Testing when the field name is explicitly set.
-        dist1 = SouthTexasCity.objects.distance('point', lagrange)
-
+
+
-
-        # Original query done on PostGIS, have to adjust AlmostEqual tolerance
-        # for Oracle.
-3
+2
-        else: tol = 5
-
-
+
+
-            for i, c in enumerate(qs):
-                self.assertAlmostEqual(distances[i], c.distance, tol)
+
+        # Now testing geodetic distance aggregation.
+        hillsdale = AustraliaCity.objects.get(name='Hillsdale')
+        if not oracle:
+            # PostGIS is limited to disance queries only to/from point geometries,
+            # ensuring a TypeError is raised if something else is put in.
+            self.assertRaises(TypeError, AustraliaCity.objects.distance, 'LINESTRING(0 0, 1 1)')
+            self.assertRaises(TypeError, AustraliaCity.objects.distance, LineString((0, 0), (1, 1)))
+
+        # Got these distances using the raw SQL statement:
+        #  SELECT ST_distance_spheroid(point, ST_GeomFromText('POINT(151.231341 -33.952685)', 4326), 'SPHEROID["WGS 84",6378137.0,298.257223563]') FROM distapp_australiacity WHERE (NOT (id = 11));
+        geodetic_distances = [60504.0628825298, 77023.948962654, 49154.8867507115, 90847.435881812, 217402.811862568, 709599.234619957, 640011.483583758, 7772.00667666425, 1047861.7859506, 1165126.55237647]
+
+        # Ensuring the expected distances are returned.
+        qs = AustraliaCity.objects.exclude(id=hillsdale.id).distance(hillsdale.point)
+        for i, c in enumerate(qs):
+            self.assertAlmostEqual(geodetic_distances[i], c.distance, tol)
-
-    def test04_distance_lookups(self):