Changeset 6884

Timestamp:

12/04/07 09:09:06 (7 months ago)

Author:

jbronn

Message:

gis: geos: Added support for EWKT (SRID only), and a transform routine that uses the GDAL facilities to transform the GEOS geometry.

Files:

• django/branches/gis/django/contrib/gis/geos/base.py (modified) (4 diffs)
• django/branches/gis/django/contrib/gis/tests/test_geos.py (modified) (1 diff)

django/branches/gis/django/contrib/gis/geos/base.py

@@ -30 +30 @@
-# library.  Not a substitute for good web security programming practices.
-hex_regex = re.compile(r'^[0-9A-F]+$', re.I)
-POINT|LINESTRING|LINEARRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)[ACEGIMLONPSRUTY\d,\.\-\(\) ]+
+SRID=(?P<srid>\d+);)?(?P<wkt>(POINT|LINESTRING|LINEARRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)[ACEGIMLONPSRUTY\d,\.\-\(\) ]+)
-
-class GEOSGeometry(object):
@@ -58 +58 @@
-                # If the regex matches, the geometry is in HEX form.
-                g = from_hex(geo_input, len(geo_input))
-            elif wkt_regex.match(geo_input):
-                # Otherwise, the geometry is in WKT form.
-                g = from_wkt(geo_input)
-            else:
-
+
+
+
+
+
+
-        elif isinstance(geo_input, GEOM_PTR):
-            # When the input is a pointer to a geomtry (GEOM_PTR).
@@ -305 +307 @@
-    #### Output Routines ####
-    @property
+    def ewkt(self):
+        "Returns the EWKT (WKT + SRID) of the Geometry."
+        if self.get_srid(): return 'SRID=%s;%s' % (self.srid, self.wkt)
+        else: return self.wkt
+
+    @property
-    def wkt(self):
-        "Returns the WKT (Well-Known Text) of the Geometry."
@@ -356 +364 @@
-        "Alias for `srs` property."
-        return self.srs
+
+    def transform(self, ct):
+        "Transforms this Geometry; only works with GDAL."
+        srid = self.srid
+        if HAS_GDAL and srid:
+            g = OGRGeometry(self.wkb, srid)
+            g.transform(ct)
+            wkb = str(g.wkb)
+            ptr = from_wkb(wkb, len(wkb))
+            if ptr:
+                # Reassigning pointer, and resetting the SRID.
+                destroy_geom(self._ptr)
+                self._ptr = ptr
+                self.srid = g.srid
+        else:
+            pass
-
-    #### Topology Routines ####

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

@@ -79 +79 @@
-            geom_t = fromstr(g.wkt)
-            self.assertEqual(geom_t.wkt, geom_h.wkt)
+
+    def test01h_ewkt(self):
+        "Testing EWKT."
+        srid = 32140
+        for p in polygons:
+            ewkt = 'SRID=%d;%s' % (srid, p.wkt)
+            poly = fromstr(ewkt)
+            self.assertEqual(srid, poly.srid)
+            self.assertEqual(srid, poly.shell.srid)
+            self.assertEqual(srid, fromstr(poly.ewkt).srid) # Checking export
-    
-    def test02a_points(self):