Changeset 6465

Timestamp:

10/07/07 17:42:26 (1 year ago)

Author:

jbronn

Message:

gis: geos: Fixed #5630 with patch from rcoup; added the ogr and srs properties.

Files:

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

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

@@ -15 +15 @@
-from django.contrib.gis.geos.libgeos import lgeos, HAS_NUMPY, ISQLQuote
-from django.contrib.gis.geos.pointer import GEOSPointer, NULL_GEOM
+
+# Trying to import GDAL libraries, if available.  Have to place in
+# try/except since this package may be used outside GeoDjango.
+try:
+    from django.contrib.gis.gdal import OGRGeometry, SpatialReference
+    HAS_GDAL=True
+except:
+    HAS_GDAL=False
-
-# Regular expression for recognizing HEXEWKB and WKT.  A prophylactic measure
@@ -436 +444 @@
-        return '<%s>%s</%s>' % (gtype, self.coord_seq.kml, gtype)
-
+    #### GDAL-specific output routines ####
+    @property
+    def ogr(self):
+        "Returns the OGR Geometry for this Geometry."
+        if HAS_GDAL:
+            if self.srid:
+                return OGRGeometry(self.wkb, self.srid)
+            else:
+                return OGRGeometry(self.wkb)
+        else:
+            return None
+
+    @property
+    def srs(self):
+        "Returns the OSR SpatialReference for SRID of this Geometry."
+        if HAS_GDAL and self.srid:
+            return SpatialReference(self.srid)
+        else:
+            return None
+
-    #### Topology Routines ####
-    def _unary_topology(self, func, *args):

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

@@ -54 +54 @@
-
-    def __len__(self):
-
+
+
-        if self.hasz: return 3
-        else: return 2

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

@@ -187 +187 @@
-
-        # Determining whether coordinate sequences pointers were passed in.
-
+n_child and 
-            self._child_cs = True
-        else:

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

@@ -5 +5 @@
-    MultiPoint, MultiLineString, MultiPolygon, GeometryCollection, \
-    fromstr, HAS_NUMPY
+from django.contrib.gis.geos.base import HAS_GDAL
-from geometries import *
-
-if HAS_NUMPY: from numpy import array
+if HAS_GDAL: from django.contrib.gis.gdal import OGRGeometry, SpatialReference
-
-class GEOSTest(unittest.TestCase):
@@ -723 +725 @@
-        self.assertEqual(8.0, mpoly.length)
-
+    def test20_emptyCollections(self):
+        "Testing empty geometries and collections."
+        gc1 = GeometryCollection([])
+        gc2 = fromstr('GEOMETRYCOLLECTION EMPTY')
+        pnt = fromstr('POINT EMPTY')
+        ls = fromstr('LINESTRING EMPTY')
+        poly = fromstr('POLYGON EMPTY')
+        mls = fromstr('MULTILINESTRING EMPTY')
+        mpoly1 = fromstr('MULTIPOLYGON EMPTY')
+        mpoly2 = MultiPolygon(())
+
+        for g in [gc1, gc2, pnt, ls, poly, mls, mpoly1, mpoly2]:
+            self.assertEqual(True, g.empty)
+
+            # Testing len() and num_geom.
+            if isinstance(g, Polygon):
+                self.assertEqual(1, len(g)) # Has one empty linear ring
+                self.assertEqual(1, g.num_geom)
+                self.assertEqual(0, len(g[0]))
+            elif isinstance(g, (Point, LineString)):
+                self.assertEqual(1, g.num_geom)
+                self.assertEqual(0, len(g))
+            else:
+                self.assertEqual(0, g.num_geom)
+                self.assertEqual(0, len(g))
+
+            # Testing __getitem__ (doesn't work on Point or Polygon)
+            if isinstance(g, Point):
+                self.assertRaises(GEOSGeometryIndexError, g.get_x)
+            elif isinstance(g, Polygon):
+                lr = g.shell
+                self.assertEqual('LINEARRING EMPTY', lr.wkt)
+                self.assertEqual(0, len(lr))
+                self.assertEqual(True, lr.empty)
+                self.assertRaises(GEOSGeometryIndexError, lr.__getitem__, 0)
+            else:
+                self.assertRaises(GEOSGeometryIndexError, g.__getitem__, 0)
+
+    def test21_test_gdal(self):
+        "Testing `ogr` and `srs` properties."
+        if not HAS_GDAL: return
+        g1 = fromstr('POINT(5 23)')
+        self.assertEqual(True, isinstance(g1.ogr, OGRGeometry))
+        self.assertEqual(g1.srs, None)
+        
+        g2 = fromstr('LINESTRING(0 0, 5 5, 23 23)', srid=4326)
+        self.assertEqual(True, isinstance(g2.ogr, OGRGeometry))
+        self.assertEqual(True, isinstance(g2.srs, SpatialReference))
+        self.assertEqual(g2.hex, g2.ogr.hex)
+        self.assertEqual('WGS 84', g2.srs.name)
+        
-def suite():
-    s = unittest.TestSuite()