Changeset 5786

Timestamp:

08/02/07 00:31:10 (1 year ago)

Author:

jbronn

Message:

gis: geos: fully-mutable geometries have landed; fixed GEOSPointer boolean value; equivalence now uses equals_exact (vertex-by-vertex matching); added in-place set operations; improved tests; getquoted() will return ST_* for PostGIS 1.2.2+.

Files:

• django/branches/gis/django/contrib/gis/geos/base.py (modified) (9 diffs)
• django/branches/gis/django/contrib/gis/geos/collections.py (modified) (7 diffs)
• django/branches/gis/django/contrib/gis/geos/geometries.py (modified) (9 diffs)
• django/branches/gis/django/contrib/gis/geos/libgeos.py (modified) (7 diffs)
• django/branches/gis/django/contrib/gis/tests/geometries.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/__init__.py (modified) (2 diffs)
• django/branches/gis/django/contrib/gis/tests/test_geos.py (modified) (9 diffs)

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

@@ -13 +13 @@
-import re
-from warnings import warn
-
+, GEOM_FUNC_PREFIX
-from django.contrib.gis.geos.error import GEOSException, GEOSGeometryIndexError
-from django.contrib.gis.geos.coordseq import GEOSCoordSeq, create_cs
@@ -88 +88 @@
-    def __del__(self):
-        "Destroys this geometry -- only if the pointer is valid and whether or not it belongs to a parent."
-
+base: 
-        # Only calling destroy on valid pointers not spawned from a parent
-        if self._ptr.valid and not self._parent: lgeos.GEOSGeom_destroy(self._ptr())
@@ -102 +102 @@
-    def __eq__(self, other):
-        "Equivalence testing."
-
+_exact
-
-    def __ne__(self, other):
-        "The not equals operator."
-
+_exact
-
-    ### Geometry set-like operations ###
@@ -116 +116 @@
-        return self.union(other)
-
+    # g1 |= g2
+    def __ior__(self, other):
+        "Reassigns this Geometry to the union of this Geometry and the other."
+        return self.union(other)
+
-    # g = g1 & g2
-    def __and__(self, other):
@@ -121 +126 @@
-        return self.intersection(other)
-
+    # g1 &= g2
+    def __iand__(self, other):
+        "Reassigns this Geometry to the intersection of this Geometry and the other."
+        return self.intersection(other)
+
-    # g = g1 - g2
-    def __sub__(self, other):
@@ -126 +136 @@
-        return self.difference(other)
-
+    # g1 -= g2
+    def __isub__(self, other):
+        "Reassigns this Geometry to the difference of this Geometry and the other."
+        return self.difference(other)
+
-    # g = g1 ^ g2
-    def __xor__(self, other):
-        "Return the symmetric difference of this Geometry and the other."
-        return self.sym_difference(other)
+
+    # g1 ^= g2
+    def __ixor__(self, other):
+        "Reassigns this Geometry to the symmetric difference of this Geometry and the other."
+        return self.sym_difference(other)
+
+    def _nullify(self):
+        """During initialization of geometries from other geometries, this routine is
+        used to nullify any parent geometries (since they will now be missing memory
+        components) and to nullify the geometry itself to prevent future access.
+        Only the address (an integer) of the current geometry is returned for use in
+        initializing the new geometry."""
+        # First getting the memory address of the geometry.
+        address = self._ptr()
+
+        # If the geometry is a child geometry, then the parent geometry pointer is
+        #  nullified.
+        if self._parent: self._parent.nullify()
+
+        # Nullifying the geometry pointer
+        self._ptr.nullify()
+
+        return address
+
+    def _reassign(self, new_geom):
+        "Internal routine for reassigning internal pointer to a new geometry."
+        # Only can re-assign when given a pointer or a geometry.
+        if not isinstance(new_geom, (GEOSPointer, GEOSGeometry)):
+            raise TypeError, 'cannot reassign geometry on given type: %s' % type(new_geom)
+        gtype = new_geom.geom_type 
+
+        # Re-assigning the internal GEOSPointer to the new geometry, nullifying
+        #  the new Geometry in the process.
+        if isinstance(new_geom, GEOSGeometry): self._ptr.set(new_geom._nullify())
+        else: self._ptr = new_geom
+        
+        # The new geometry class may be different from the original, so setting
+        #  the __class__ and populating the internal geometry or ring dictionary.
+        self.__class__ = GEOS_CLASSES[gtype]
+        if isinstance(self, (Polygon, GeometryCollection)): self._populate()
-
-    #### Psycopg2 database adaptor routines ####
@@ -141 +196 @@
-    def getquoted(self):
-        "Returns a properly quoted string for use in PostgresSQL/PostGIS."
-
+
+
-    
-    #### Coordinate Sequence Routines ####
@@ -300 +356 @@
-        "Gets the SRID for the geometry, returns None if no SRID is set."
-        s = lgeos.GEOSGetSRID(self._ptr())
-
-
-
-
+
+
-
-    def set_srid(self, srid):
@@ -405 +459 @@
-    def clone(self):
-        "Clones this Geometry."
-
+, srid=self.srid
-
-# Class mapping dictionary

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

@@ -5 +5 @@
-from ctypes import c_int, c_uint, byref, cast
-from types import TupleType, ListType
-init_from_geom, 
+
-from django.contrib.gis.geos.base import GEOSGeometry
-from django.contrib.gis.geos.error import GEOSException, GEOSGeometryIndexError
-from django.contrib.gis.geos.geometries import Point, LineString, LinearRing, Polygon
-
-def init_from_poly(poly):
-    "Internal routine used for initializing Geometry Collections from Polygons."
-    # Constructing a new Polygon to take control of the rings.
-    p = Polygon(*tuple(ring for ring in poly))
-    
-    # If this Polygon came from a GeometryCollection, it is a child
-    #  and the parent geometry pointer is nullified.
-    if poly._parent: poly._parent.nullify()
-    
-    # Nullifying the polygon pointer
-    poly._ptr.nullify()
-
-    # Returning the address of the new Polygon.
-    return p._ptr()
-
-class GeometryCollection(GEOSGeometry):
@@ -30 +15 @@
-
-    def __init__(self, *args, **kwargs):
+        "Initializes a Geometry Collection from a sequence of Geometry objects."
+        # Setting up the collection for creation
-        self._ptr = GEOSPointer(0) # Initially NULL
-        self._geoms = {}
-Fals
+Non
-
+        # Checking the arguments
-        if not args:
-LinearRing to initialize Polygon.'
+Geometry to initialize %s.' % self.__class__.__name__
-
-        if len(args) == 1: # If only one geometry provided or a list of geometries is provided
@@ -55 +43 @@
-        # Incrementing through each input geometry.
-        for i in xrange(ngeom):
-
-
-
-
-
-
+
+
-        # Calling the parent class, using the pointer returned from GEOS createCollection()
-        super(GeometryCollection, self).__init__(lgeos.GEOSGeom_createCollection(c_int(self._typeid), byref(geoms), c_uint(ngeom)), **kwargs)
@@ -66 +50 @@
-    def __del__(self):
-        "Overloaded deletion method for Geometry Collections."
-
+collection: 
-        # If this geometry is still valid, it hasn't been modified by others.
-        if self._ptr.valid:
-            # Nullifying pointers to internal geometries, preventing any attempted future access.
-            for k in self._geoms: self._geoms[k].nullify()
-            super(GeometryCollection, self).__del__()
-        else:
-            # Internal memory has become part of other Geometry objects, must delete the
@@ -81 +64 @@
-                    lgeos.GEOSGeom_destroy(self._geoms[k].address)
-                    self._geoms[k].nullify()
+        super(GeometryCollection, self).__del__()
-            
-    def __getitem__(self, index):
-For indexing on the multiple geometries
+Returns the Geometry from this Collection at the given index (0-based)
-        # Checking the index and returning the corresponding GEOS geometry.
-        self._checkindex(index)
-        return GEOSGeometry(self._geoms[index], parent=self._ptr, srid=self.srid)
-
+    def __setitem__(self, index, geom):
+        "Sets the Geometry at the specified index."
+        self._checkindex(index)
+        if not isinstance(geom, self._allowed):
+            raise TypeError, 'Incompatible Geometry for collection.'
+
+        # Constructing the list of geometries that will go in the collection.
+        new_geoms = []
+        for i in xrange(len(self)):
+            if i == index: new_geoms.append(geom)
+            else: new_geoms.append(self[i])
+
+        # Creating a new geometry collection from the list, and
+        #  re-assigning the pointers.
+        new_collection = self.__class__(*new_geoms)
+        self._reassign(new_collection)
+        
-    def __iter__(self):
-For iteration on the multiple geometries
+Iterates over each Geometry in the Collection
-        for i in xrange(len(self)):
-            yield self.__getitem__(i)
-
-    def __len__(self):
-c
+C
-        return self.num_geom
-
@@ -102 +103 @@
-            raise GEOSGeometryIndexError, 'invalid GEOS Geometry index: %s' % str(index)
-
+    def _nullify(self):
+        "Overloaded from base method to nullify geometry references in this Collection."
+        # Nullifying the references to the internal Geometry objects from this Collection.
+        for k in self._geoms: self._geoms[k].nullify()
+        return super(GeometryCollection, self)._nullify()
+
-    def _populate(self):
-        "Populates the internal child geometry dictionary."
@@ -107 +114 @@
-        for i in xrange(self.num_geom):
-            self._geoms[i] = GEOSPointer(lgeos.GEOSGetGeometryN(self._ptr(), c_int(i)))
-
-
-# MultiPoint, MultiLineString, and MultiPolygon class definitions.

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

@@ -8 +8 @@
-from types import FloatType, IntType, ListType, TupleType
-from django.contrib.gis.geos.coordseq import GEOSCoordSeq, create_cs
-init_from_geom, 
+
-from django.contrib.gis.geos.base import GEOSGeometry
-from django.contrib.gis.geos.error import GEOSException, GEOSGeometryIndexError
@@ -22 +22 @@
-        """
-
+        # Setting-up for Point Creation
-        self._ptr = GEOSPointer(0) # Initially NULL
+        self._parent = None
-
-        if isinstance(x, (TupleType, ListType)):
@@ -133 +135 @@
-          ls = LineString(Point(1, 1), Point(2, 2))
-        """
+        # Setting up for LineString creation
-        self._ptr = GEOSPointer(0) # Initially NULL
+        self._parent = None
-
-        # If only one argument was provided, then set the coords array appropriately
@@ -255 +259 @@
-        """
-        self._ptr = GEOSPointer(0) # Initially NULL
+        self._parent = None
-        self._rings = {} 
-        if not args:
@@ -278 +283 @@
-        for i in xrange(nholes):
-            # Casting to the Geometry Pointer type
-from_geom(init_holes[i]
+holes[i]._nullify(
-                      
-        # Getting the shell pointer address, 
-init_from_geom(ext_ring
+ext_ring._nullify(
-
-        # Calling with the GEOS createPolygon factory.
@@ -288 +293 @@
-    def __del__(self):
-        "Overloaded deletion method for Polygons."
-
+polygon: 
-        # If this geometry is still valid, it hasn't been modified by others.
-        if self._ptr.valid:
-            # Nulling the pointers to internal rings, preventing any attempted future access
-            for k in self._rings: self._rings[k].nullify()
-
-
+
-            # Internal memory has become part of other objects; must delete the 
-            #  internal objects which are still valid individually, since calling
-            #  destructor on entire geometry will result in an attempted deletion 
-
+
+
-            for k in self._rings:
-                if self._rings[k].valid:
-                    lgeos.GEOSGeom_destroy(self._rings[k].address)
-                    self._rings[k].nullify()
+        super(Polygon, self).__del__()
-
-    def __getitem__(self, index):
-        """Returns the ring at the specified index.  The first index, 0, will always
-        return the exterior ring.  Indices > 0 will return the interior ring."""
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def __iter__(self):
@@ -325 +345 @@
-        return self.num_interior_rings + 1
-
+    def _checkindex(self, index):
+        "Internal routine for checking the given ring index."
+        if index < 0 or index >= len(self):
+            raise GEOSGeometryIndexError, 'invalid Polygon ring index: %s' % index
+
+    def _nullify(self):
+        "Overloaded from base method to nullify ring references as well."
+        # Nullifying the references to the internal rings of this Polygon.
+        for k in self._rings: self._rings[k].nullify()
+        return super(Polygon, self)._nullify()
+
-    def _populate(self):
-        "Populates the internal rings dictionary."
@@ -337 +368 @@
-        """Gets the interior ring at the specified index,
-        0 is for the first interior ring, not the exterior ring."""
-
-
-
-
-
-
-
+
+
+
-        return GEOSGeometry(self._rings[ring_i+1], parent=self._ptr, srid=self.srid)
-                                                        
@@ -362 +389 @@
-        return GEOSGeometry(self._rings[0], parent=self._ptr, srid=self.srid)
-
-
+, ring
-        "Sets the exterior ring of the Polygon."
-
-
+
-
-    # properties for the exterior ring/shell
-
-
+, set_ext_ring
+, set_ext_ring
-    
-    @property

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

@@ -19 +19 @@
-    HAS_NUMPY = False
-
-Psycopg2 support
+Are psycopg2 and GeoDjango models being us
-try:
-    from psycopg2.extensions import ISQLQuote
-
+
+
-    ISQLQuote = None
+    GEOM_FUNC_PREFIX = None
-
-# Setting the appropriate name for the GEOS-C library, depending on which
@@ -72 +74 @@
-lgeos.initGEOS(notice_h, error_h)
-
-utilitie
+object, related C data structures, and function
-
-# Opaque GEOS geometry structure
@@ -78 +80 @@
-    "Opaque structure used when arrays of geometries are needed as parameters."
-    pass
+
-# Pointer to opaque geometry structure
-GEOM_PTR = POINTER(GEOSGeom_t)
+
-# Used specifically by the GEOSGeom_createPolygon and GEOSGeom_createCollection GEOS routines
-def get_pointer_arr(n):
@@ -86 +90 @@
-    return GeomArr()
-
-#### GEOS Pointer object and routines ####
-class GEOSPointer(object):
-    """The GEOSPointer provides a layer of abstraction in accessing the values returned by
@@ -109 +112 @@
-        else: raise GEOSException, 'GEOS pointer no longer valid (was this geometry or the parent geometry deleted or modified?)'
-
-bool
+nonzero
-        "Returns True when the GEOSPointer is valid."
-        return self.valid
@@ -115 +118 @@
-    def __str__(self):
-        return str(self.address)
+
+    def __repr__(self):
+        return 'GEOSPointer(%s)' % self.address
-
-    ### GEOSPointer Properties ###
@@ -162 +168 @@
-        self.set(0)
-        self.set(0, coordseq=True)
-
-def init_from_geom(geom):
-    """During initialization of geometries from other geometries, this routine is 
-    used to nullify any parent geometries (since they will now be missing memory 
-    components) and to nullify the geometry itself to prevent future access.  
-    Only the address (an integer) of the current geometry is returned for use in 
-    initializing the new geometry."""
-    # First getting the memory address of the geometry.
-    address = geom._ptr()
-
-    # If the geometry is a child geometry, then the parent geometry pointer is
-    #  nullified.
-    if geom._parent: geom._parent.nullify()
-
-    # Nullifying the geometry pointer
-    geom._ptr.nullify()
-
-    return address

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

@@ -116 +116 @@
-
-intersect_geoms = ( TestGeom('POLYGON ((5 5,5 0,0 0,0 5,5 5))'),
-11 3, 13 4, 15 6, 16 8, 16 10, 15 12, 13 13, 11 12, 10 10, 9 12, 7 13, 5 12, 4 10, 4 8, 5 6, 7 4, 9 3, 10 1))')
+9 3, 7 4, 5 6, 4 8, 4 10, 5 12, 7 13, 9 12, 10 10, 11 12, 13 13, 15 12, 16 10, 16 8, 15 6, 13 4, 11 3, 10 1))'),
-                    )
-
-union_geoms = ( TestGeom('POLYGON ((-5 0,-5 10,5 10,5 5,10 5,10 -5,0 -5,0 0,-5 0))'),
-18 0, 18 15, 2 15
+2 15, 18 15, 18 0
-                )
-
-diff_geoms = ( TestGeom('POLYGON ((-5 0,-5 10,5 10,5 5,0 5,0 0,-5 0))'),
-18 0, 18 15, 2 15
+2 15, 18 15, 18 0
-               )
-
-sdiff_geoms = ( TestGeom('MULTIPOLYGON (((-5 0,-5 10,5 10,5 5,0 5,0 0,-5 0)),((0 0,5 0,5 5,10 5,10 -5,0 -5,0 0)))'),
-18 0, 18 15, 2 15
+2 15, 18 15, 18 0
-                )
-

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

@@ -57 +57 @@
-
-    # Getting initial values.
+    old_debug = settings.DEBUG
-    old_name = copy(settings.DATABASE_NAME)
-    old_installed = copy(settings.INSTALLED_APPS)
+
+    # Want DEBUG to be set to False.
+    settings.DEBUG = False
-
-    # Creating the test suite, adding the test models to INSTALLED_APPS, and
@@ -83 +87 @@
-    # Cleaning up, destroying the test spatial database and resetting the INSTALLED_APPS.
-    destroy_test_db(old_name, verbosity)
+    settings.DEBUG = old_debug
-    settings.INSTALLED_APPS = old_installed
-    

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

@@ -1 @@
-
+random, 
-from django.contrib.gis.geos import \
-    GEOSException, GEOSGeometryIndexError, \
@@ -167 +167 @@
-            self.assertEqual(lr, LinearRing(*lr.tuple))
-            self.assertEqual(lr, LinearRing([list(tup) for tup in lr.tuple]))
-Str
+arR
-    
-    def test05a_polygons(self):
@@ -201 +201 @@
-                self.assertEqual(p.ext_ring_cs, poly[0].tuple) # Testing __getitem__
-
-
+
+
+
+
+
+
-            for r in poly:
-ing
-ing
+
+
-
-            # Testing polygon construction.
@@ -225 +230 @@
-                pass
-            poly[0][1] = newval # setting the second point in the polygon with the newvalue (based on the old)
-
-Even
+ new value
+Should be
-            
-    def test05b_multipolygons(self):
@@ -427 +432 @@
-            b = GEOSGeometry(g_tup[1].wkt)
-            i1 = GEOSGeometry(intersect_geoms[i].wkt) 
-
-            self.assertEqual(True, a.intersects(b))
-            i2 = a.intersection(b)
-            self.assertEqual(i1, i2)
-
+
+
+
-
-    def test11_union(self):
@@ -442 +448 @@
-            u2 = a.union(b)
-            self.assertEqual(u1, u2)
-
+
+
+
-
-    def test12_difference(self):
@@ -453 +461 @@
-            d2 = a.difference(b)
-            self.assertEqual(d1, d2)
-
+
+
+
-
-    def test13_symdifference(self):
@@ -464 +474 @@
-            d2 = a.sym_difference(b)
-            self.assertEqual(d1, d2)
-
+
+
+
-
-    def test14_buffer(self):
@@ -493 +505 @@
-                    self.assertAlmostEqual(exp_ring[k][1], buf_ring[k][1], 9)
-
+    def test15_srid(self):
+        "Testing the SRID property and keyword."
+        # Testing SRID keyword on Point
+        pnt = Point(5, 23, srid=4326)
+        self.assertEqual(4326, pnt.srid)
+        pnt.srid = 3084
+        self.assertEqual(3084, pnt.srid)
+        self.assertRaises(TypeError, pnt.set_srid, '4326')
+
+        # Testing SRID keyword on fromstr(), and on Polygon rings.
+        poly = fromstr(polygons[1].wkt, srid=4269)
+        self.assertEqual(4269, poly.srid)
+        for ring in poly: self.assertEqual(4269, ring.srid)
+        poly.srid = 4326
+        self.assertEqual(4326, poly.shell.srid)
+
+        # Testing SRID keyword on GeometryCollection
+        gc = GeometryCollection(Point(5, 23), LineString((0, 0), (1.5, 1.5), (3, 3)), srid=32021)
+        self.assertEqual(32021, gc.srid)
+        for i in range(len(gc)): self.assertEqual(32021, gc[i].srid)
+
+    def test16_mutable_geometries(self):
+        "Testing the mutability of Polygons and Geometry Collections."
+        ### Testing the mutability of Polygons ###
+        for p in polygons:
+            poly = fromstr(p.wkt)
+
+            # Should only be able to use __setitem__ with LinearRing geometries.
+            self.assertRaises(TypeError, poly.__setitem__, 0, LineString((1, 1), (2, 2)))
+
+            # Constructing the new shell by adding 500 to every point in the old shell.
+            shell_tup = poly.shell.tuple
+            new_coords = []
+            for point in shell_tup: new_coords.append((point[0] + 500., point[1] + 500.))
+            shell1 = LinearRing(*tuple(new_coords))
+            shell2 = shell1.clone() 
+
+            # Assigning polygon's exterior ring w/the new shell
+            poly.exterior_ring = shell1
+            self.assertRaises(GEOSException, str, shell1) # shell1 should no longer be accessible
+            self.assertEqual(poly.exterior_ring, shell2)
+            self.assertEqual(poly[0], shell2)
+            del poly, shell1, shell_tup # cleaning up
+
+        ### Testing the mutability of Geometry Collections
+        for tg in multipoints:
+            mp = fromstr(tg.wkt)
+            for i in range(len(mp)):
+                # Creating a random point.
+                pnt = mp[i].clone()
+                new = Point(random.randint(1, 100), random.randint(1, 100))
+                tmp = new.clone()
+                # Testing the assignmen
+                mp[i] = tmp
+                self.assertRaises(GEOSException, len, tmp)
+                self.assertEqual(mp[i], new)
+                self.assertEqual(mp[i].wkt, new.wkt)
+                self.assertNotEqual(pnt, mp[i])
+            del mp
+
+        # Multipolygons involve much more memory management because each
+        #  polygon w/in the collection has its own rings.
+        for tg in multipolygons:
+            mpoly = fromstr(tg.wkt)
+            for i in xrange(len(mpoly)):
+                poly = mpoly[i].clone()
+                # Offsetting the each ring in the polygon by 500.
+                tmp = poly.clone()
+                for r in tmp: 
+                    for j in xrange(len(r)): r[j] = (r[j][0] + 500., r[j][1] + 500.)
+                self.assertNotEqual(poly, tmp)
+                new = tmp.clone() # a 'reference' copy of the geometry used in assignment
+                # Testing the assignment
+                mpoly[i] = tmp
+                self.assertRaises(GEOSException, str, tmp)
+                self.assertEqual(mpoly[i], new)
+                self.assertNotEqual(poly, mpoly[i])
+            del mpoly
+
-def suite():
-    s = unittest.TestSuite()