Changeset 7666 for django/branches/gis/django/contrib/gis/models.py

Timestamp:

06/16/08 11:58:12 (7 months ago)

Author:

jbronn

Message:

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.

Files:

• django/branches/gis/django/contrib/gis/models.py (modified) (2 diffs)

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

@@ -227 +227 @@
-        during field initialization).
-        """
+        # SRID=-1 is a common convention for indicating the geometry has no
+        # spatial reference information associated with it.  Thus, we will
+        # return all None values without raising an exception.
+        if srid == -1: return None, None, None
+
+        # Getting the spatial reference WKT associated with the SRID from the
+        # `spatial_ref_sys` (or equivalent) spatial database table. This query
+        # cannot be executed using the ORM because this information is needed
+        # when the ORM cannot be used (e.g., during the initialization of 
+        # `GeometryField`).
-        from django.db import connection
-        # Getting the spatial reference WKT associated with the SRID from the
-        # `spatial_ref_sys` (or equivalent) spatial database table.
-        #
-        # The following doesn't work: SpatialRefSys.objects.get(srid=srid)
-        # Why?  `syncdb` fails to recognize installed geographic models when there's
-        # an ORM query instantiated within a model field.
-        cur = connection.cursor()
-        qn = connection.ops.quote_name
@@ -243 +247 @@
-                       }
-        cur.execute(stmt)
-
-
-
+
+
+
+
+
+
+
-
-        # Getting metadata associated with the spatial reference system identifier.