Changeset 5448

Timestamp:

06/09/07 14:55:42 (2 years ago)

Author:

jbronn

Message:

gis: NULL geometries are now allowed (thanks Robert Coup!), field parameter no longer needed for _post_create_sql(), and added extra instance methods for SpatialReference?/SRID.

Files:

• django/branches/gis/django/contrib/gis/db/models/fields/__init__.py (modified) (4 diffs)
• django/branches/gis/django/contrib/gis/db/models/GeoMixin.py (modified) (1 diff)
• django/branches/gis/django/core/management.py (modified) (1 diff)

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

@@ -34 +34 @@
-        super(GeometryField, self).__init__(**kwargs) # Calling the parent initializtion function
-
-, field
+
-        """Constructs the addition of the geometry to the table using the
-function
+stored procedure
-
-s well as
-nd field
+nd
+s parameters
-        """
-        sql = style.SQL_KEYWORD('SELECT ') + \
-              style.SQL_TABLE('AddGeometryColumn') + '(' + \
-              style.SQL_TABLE(quotename(db_table)) + ', ' + \
-field
+self.column
-              style.SQL_FIELD(str(self._srid)) + ', ' + \
-              style.SQL_COLTYPE(quotename(self._geom)) + ', ' + \
-              style.SQL_KEYWORD(str(self._dim)) + ');'
+
+        if not self.null:
+            # Add a NOT NULL constraint to the field
+            sql += '\n' + \
+                   style.SQL_KEYWORD('ALTER TABLE ') + \
+                   style.SQL_TABLE(quotename(db_table, dbl=True)) + \
+                   style.SQL_KEYWORD(' ALTER ') + \
+                   style.SQL_FIELD(quotename(self.column, dbl=True)) + \
+                   style.SQL_KEYWORD(' SET NOT NULL') + ';' 
-        return sql
-
- field,
+
-                    index_type='GIST', index_opts='GIST_GEOMETRY_OPS'):
-        "Creates a GiST index for this geometry field."
-        sql = style.SQL_KEYWORD('CREATE INDEX ') + \
-field
+self.column
-              style.SQL_KEYWORD(' ON ') + \
-              style.SQL_TABLE(quotename(db_table, dbl=True)) + \
-              style.SQL_KEYWORD(' USING ') + \
-              style.SQL_COLTYPE(index_type) + ' ( ' + \
-field
+self.column
-              style.SQL_KEYWORD(index_opts) + ' );'
-        return sql
-
-, field
+
-        """Returns SQL that will be executed after the model has been
-        created. Geometry columns must be added after creation with the
@@ -70 +79 @@
-        # Getting the AddGeometryColumn() SQL necessary to create a PostGIS
-        # geometry field.
-, field
+
-
-        # If the user wants to index this data, then get the indexing SQL as well.
-        if self._index:
-, field
+
-        else:
-            return post_sql
@@ -84 +93 @@
-        setattr(cls, 'get_%s_geos' % self.name, curry(cls._get_GEOM_geos, field=self))
-        setattr(cls, 'get_%s_ogr' % self.name, curry(cls._get_GEOM_ogr, field=self, srid=self._srid))
+        setattr(cls, 'get_%s_srid' % self.name, curry(cls._get_GEOM_srid, srid=self._srid))
+        setattr(cls, 'get_%s_srs' % self.name, curry(cls._get_GEOM_srs, srid=self._srid))
-        setattr(cls, 'get_%s_wkt' % self.name, curry(cls._get_GEOM_wkt, field=self))
-        setattr(cls, 'get_%s_centroid' % self.name, curry(cls._get_GEOM_centroid, field=self))
@@ -95 +106 @@
-        included by default in these queries."""
-        if lookup_type in POSTGIS_TERMS:
-'SRID=%d;%s' % (self._srid, value)
+value and ("SRID=%d;%s" % (self._srid, value)) or None
-        raise TypeError("Field has invalid lookup: %s" % lookup_type)
-
-    def get_db_prep_save(self, value):
-        "Making sure the SRID is included before saving."
-'SRID=%d;%s' % (self._srid, value)
+value and ("SRID=%d;%s" % (self._srid, value)) or None
-
-    def get_manipulator_field_objs(self):

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

@@ -6 +6 @@
-# the necessary functions that may be contributed for geographic objects.
-class GeoMixin:
-,
+
-
-    # A subclass of Model is specifically needed so that these geographic
-    # routines are present for instantiations of the models.
-    def _get_GEOM_geos(self, field):
-Get
+Return
-        return GEOSGeometry(getattr(self, field.attname), 'hex')
-
-    def _get_GEOM_ogr(self, field, srid):
-Get
+Return
-        return OGRGeometry(hex_to_wkt(getattr(self, field.attname)),
-                           SpatialReference('EPSG:%d' % srid))
-
+    def _get_GEOM_srid(self, srid):
+        "Returns the spatial reference identifier (SRID) of the geometry."
+        return srid
+
+    def _get_GEOM_srs(self, srid):
+        "Returns ane OGR Spatial Reference object of the geometry."
+        return SpatialReference('EPSG:%d' % srid)
+
-    def _get_GEOM_wkt(self, field):
-Get
+Return
-        hex = getattr(self, field.attname)
-        return hex_to_wkt(hex)
-
-    def _get_GEOM_centroid(self, field):
-Get
+Return
-        hex = getattr(self, field.attname)
-        return centroid(hex)
-    
-    def _get_GEOM_area(self, field):
-Get
+Return
-        hex = getattr(self, field.attname)
-        return area(hex)

django/branches/gis/django/core/management.py

@@ -389 +389 @@
-    for f in opts.fields:
-        if hasattr(f, '_post_create_sql'):
-, f.column
+
-
-    return output