Changeset 7012

Timestamp:

01/09/08 13:42:23 (6 months ago)

Author:

jbronn

Message:

gis: gdal: GeometryCollection.add() now accepts other collections, and associated tests.

Files:

• django/branches/gis/django/contrib/gis/gdal/geometries.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/test_gdal_geom.py (modified) (1 diff)

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

@@ -539 +539 @@
-        "Add the geometry to this Geometry Collection."
-        if isinstance(geom, OGRGeometry):
-
+
+
+
+
-        elif isinstance(geom, (StringType, UnicodeType)):
-            tmp = OGRGeometry(geom)
-ptr = tmp._ptr
+add_geom(self._ptr, tmp._ptr)
-        else:
-            raise OGRException('Must add an OGRGeometry.')
-        add_geom(self._ptr, ptr)
-
-    @property

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

@@ -324 +324 @@
-            self.assertEqual(u1, a)
-
+    def test14_add(self):
+        "Testing GeometryCollection.add()."
+        # Can't insert a Point into a MultiPolygon.
+        mp = OGRGeometry('MultiPolygon')
+        pnt = OGRGeometry('POINT(5 23)')
+        self.assertRaises(OGRException, mp.add, pnt)
+
+        # GeometryCollection.add may take an OGRGeometry (if another collection
+        # of the same type all child geoms will be added individually) or WKT.
+        for mp in multipolygons:
+            mpoly = OGRGeometry(mp.wkt)
+            mp1 = OGRGeometry('MultiPolygon')
+            mp2 = OGRGeometry('MultiPolygon')
+            mp3 = OGRGeometry('MultiPolygon')
+
+            for poly in mpoly:
+                mp1.add(poly) # Adding a geometry at a time
+                mp2.add(poly.wkt) # Adding WKT
+            mp3.add(mpoly) # Adding a MultiPolygon's entire contents at once.
+            for tmp in (mp1, mp2, mp3): self.assertEqual(mpoly, tmp)
+
-def suite():
-    s = unittest.TestSuite()