Changeset 7404

Timestamp:

04/07/08 15:15:04 (3 months ago)

Author:

jbronn

Message:

gis: geos: GEOSGeometry objects may now be pickled; added the clone keyword to transform which returns a cloned transformed geometry rather than transforming in-place.

Files:

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

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

@@ -88 +88 @@
-            raise GEOSException('Could not initialize GEOS Geometry with given input.')
-
+        # Post-initialization setup.
+        self._post_init(srid)
+
+    def _post_init(self, srid):
+        "Helper routine for performing post-initialization setup."
-        # Setting the SRID, if given.
-        if srid and isinstance(srid, int): self.srid = srid
-
+
-        # Setting the class type (e.g., Point, Polygon, etc.)
-        self.__class__ = GEOS_CLASSES[self.geom_typeid]
-
-        # Setting the coordinate sequence for the geometry (will be None on 
- 
+
-        self._set_cs()
-
+
-    @property
-    def ptr(self):
@@ -139 +144 @@
-        "Short-hand representation because WKT may be very large."
-        return '<%s object at %s>' % (self.geom_type, hex(addressof(self.ptr)))
+
+    # Pickling support
+    def __getstate__(self):
+        # The pickled state is simply a tuple of the WKB (in string form)
+        # and the SRID.
+        return str(self.wkb), self.srid
+
+    def __setstate__(self, state):
+        # Instantiating from the tuple state that was pickled.
+        wkb, srid = state
+        ptr = from_wkb(wkb, len(wkb))
+        if not ptr: raise GEOSException('Invalid Geometry loaded from pickled state.')
+        self._ptr = ptr
+        self._post_init(srid)
-
-    # Comparison operators
@@ -414 +433 @@
-        return self.srs
-
-
-
+
+
+
+
+
+
+
+
+
-        srid = self.srid
-        if HAS_GDAL and srid:
@@ -422 +448 @@
-            wkb = str(g.wkb)
-            ptr = from_wkb(wkb, len(wkb))
+            if clone: 
+                # User wants a cloned transformed geometry returned.
+                return GEOSGeometry(ptr, srid=g.srid)
-            if ptr:
-
+
+
-                destroy_geom(self.ptr)
-                self._ptr = ptr
-
-
-
-
-
+
+
+
-
-    #### Topology Routines ####

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

@@ -704 +704 @@
-        ct = CoordTransform(SpatialReference('WGS84'), SpatialReference(2774))
-        t3.transform(ct)
+
+        # Testing use of the `clone` keyword.
+        k1 = orig.clone()
+        k2 = k1.transform(trans.srid, clone=True)
+        self.assertEqual(k1, orig)
+        self.assertNotEqual(k1, k2)
+
-        prec = 3
-
+, k2
-            self.assertAlmostEqual(trans.x, p.x, prec)
-            self.assertAlmostEqual(trans.y, p.y, prec)
@@ -725 +732 @@
-        self.assertEqual((xmin, ymin, xmax, ymax), poly.extent)
-
+    def test25_pickle(self):
+        "Testing pickling and unpickling support."
+        # Using both pickle and cPickle -- just 'cause.
+        import pickle, cPickle
+
+        # Creating a list of test geometries for pickling, 
+        # and setting the SRID on some of them.
+        def get_geoms(lst, srid=None):
+            return [GEOSGeometry(tg.wkt, srid) for tg in lst]
+        tgeoms = get_geoms(points)
+        tgeoms.extend(get_geoms(multilinestrings, 4326))
+        tgeoms.extend(get_geoms(polygons, 3084))
+        tgeoms.extend(get_geoms(multipolygons, 900913))
+        
+        for geom in tgeoms:
+            s1, s2 = cPickle.dumps(geom), pickle.dumps(geom)
+            g1, g2 = cPickle.loads(s1), pickle.loads(s2)
+            for tmpg in (g1, g2):
+                self.assertEqual(geom, tmpg)
+                self.assertEqual(geom.srid, tmpg.srid)
+
-def suite():
-    s = unittest.TestSuite()