shapely 1.0.7__tar.gz → 1.0.12__tar.gz

{Shapely-1.0.7 → Shapely-1.0.12}/CHANGES.txt

@@ -1,5 +1,27 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.0.12 (2009-04-09)
+-------------------
+- Fix for references held by topology and predicate descriptors.
+
+1.0.11 (2008-11-20)
+-------------------
+- Work around bug in GEOS 2.2.3, GEOSCoordSeq_getOrdinate not exported properly
+  (#178).
+
+1.0.10 (2008-11-17)
+-------------------
+- Fixed compatibility with GEOS 2.2.3 that was broken in 1.0.8 release (#176).
+
+1.0.9 (2008-11-16)
+------------------
+- Find and load MacPorts libgeos.
+
+1.0.8 (2008-11-01)
+------------------
+- Fill out GEOS function result and argument types to prevent faults on a
+  64-bit arch.
+
 1.0.7 (2008-08-22)
 ------------------
 - Polygon rings now have the same dimensions as parent (#168).

Shapely-1.0.12/GEOS-C-API.txt

@@ -0,0 +1,55 @@
+Ctypes declarations for functions present in GEOS C API 1.4, but not present in
+1.3, are listed below:
+
+lgeos.GEOS_getWKBOutputDims.restype = ctypes.c_int
+lgeos.GEOS_getWKBByteOrder.restype = ctypes.c_int
+lgeos.GEOS_setWKBByteOrder.restype = ctypes.c_int
+lgeos.GEOS_setWKBByteOrder.argtypes = [ctypes.c_int]
+lgeos.GEOSGeomFromHEX_buf.restype = ctypes.c_void_p
+lgeos.GEOSGeomFromHEX_buf.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
+lgeos.GEOSSimplify.restype = ctypes.c_void_p
+lgeos.GEOSSimplify.argtypes = [ctypes.c_void_p, ctypes.c_double]
+lgeos.GEOSTopologyPreserveSimplify.restype = ctypes.c_void_p
+lgeos.GEOSTopologyPreserveSimplify.argtypes = [ctypes.c_void_p, ctypes.c_double]
+lgeos.GEOSEqualsExact.restype = ctypes.c_int
+lgeos.GEOSEqualsExact.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_double]
+lgeos.GEOSNormalize.restype = ctypes.c_int
+lgeos.GEOSNormalize.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKTReader_create.restype = ctypes.c_void_p
+lgeos.GEOSWKTReader_destroy.restype = None
+lgeos.GEOSWKTReader_destroy.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKTReader_read.restype = ctypes.c_void_p
+lgeos.GEOSWKTReader_read.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+lgeos.GEOSWKTWriter_create.restype = ctypes.c_void_p
+lgeos.GEOSWKTWriter_destroy.restype = None
+lgeos.GEOSWKTWriter_destroy.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKTWriter_write.restype = ctypes.c_char_p
+lgeos.GEOSWKTWriter_write.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+lgeos.GEOSWKBReader_create.restype = ctypes.c_void_p
+lgeos.GEOSWKBReader_destroy.restype = None
+lgeos.GEOSWKBReader_destroy.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKBReader_read.restype = ctypes.c_void_p
+lgeos.GEOSWKBReader_read.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t]
+lgeos.GEOSWKBReader_readHEX.restype = ctypes.c_void_p
+lgeos.GEOSWKBReader_readHEX.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t]
+lgeos.GEOSWKBWriter_create.restype = ctypes.c_void_p
+lgeos.GEOSWKBWriter_destroy.restype = None
+lgeos.GEOSWKBWriter_destroy.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKBWriter_getOutputDimension.restype = ctypes.c_int
+lgeos.GEOSWKBWriter_getOutputDimension.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKBWriter_setOutputDimension.restype = None
+lgeos.GEOSWKBWriter_setOutputDimension.argtypes = [ctypes.c_void_p, ctypes.c_int]
+lgeos.GEOSWKBWriter_getByteOrder.restype = ctypes.c_int
+lgeos.GEOSWKBWriter_getByteOrder.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKBWriter_setByteOrder.restype = None
+lgeos.GEOSWKBWriter_setByteOrder.argtypes = [ctypes.c_void_p, ctypes.c_int]
+lgeos.GEOSWKBWriter_getIncludeSRID.restype = ctypes.c_char
+lgeos.GEOSWKBWriter_getIncludeSRID.argtypes = [ctypes.c_void_p]
+lgeos.GEOSWKBWriter_setIncludeSRID.restype = None
+lgeos.GEOSWKBWriter_setIncludeSRID.argtypes = [ctypes.c_void_p, ctypes.c_char]
+
+Furthermore, the following unneeded declarations are removed to avoid problems
+with Debian's 2.2.3 package:
+
+lgeos.GEOSCoordSeq_getOrdinate.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getOrdinate.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_void_p]

{Shapely-1.0.7 → Shapely-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.7
+Version: 1.0.12
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.0.7 → Shapely-1.0.12}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.7
+Version: 1.0.12
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.0.7 → Shapely-1.0.12}/Shapely.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 CHANGES.txt
 CREDITS.txt
+GEOS-C-API.txt
 HISTORY.txt
 LICENSE.txt
 README.txt
@@ -15,9 +16,9 @@ examples/world.py
 manual/manual.txt
 manual/style.css
 shapely/__init__.py
+shapely/ctypes_declarations.py
 shapely/geos.py
 shapely/iterops.py
-shapely/kml.py
 shapely/ops.py
 shapely/predicates.py
 shapely/topology.py
@@ -56,3 +57,4 @@ tests/rungrind.dist
 tests/test_doctests.py
 tests/test_threads.py
 tests/valgrind-python.supp
+tests/wkt_locale.txt

{Shapely-1.0.7 → Shapely-1.0.12}/setup.py

@@ -10,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.7',
+      version       = '1.0.12',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.7 → Shapely-1.0.12}/setup_windows.py

@@ -10,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.7',
+      version       = '1.0.12',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

Shapely-1.0.12/shapely/ctypes_declarations.py

@@ -0,0 +1,204 @@
+import ctypes
+
+lgeos = lgeos   # reduce pyflakes complaints
+
+lgeos.initGEOS.restype = None
+
+lgeos.finishGEOS.restype = None
+
+lgeos.GEOSversion.restype = ctypes.c_char_p
+
+lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p
+lgeos.GEOSGeomFromWKT.argtypes = [ctypes.c_char_p]
+
+lgeos.GEOSGeomToWKT.restype = ctypes.c_char_p
+lgeos.GEOSGeomToWKT.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOS_setWKBOutputDims.restype = ctypes.c_int
+lgeos.GEOS_setWKBOutputDims.argtypes = [ctypes.c_int]
+
+lgeos.GEOSGeomFromWKB_buf.restype = ctypes.c_void_p
+lgeos.GEOSGeomFromWKB_buf.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
+
+lgeos.GEOSCoordSeq_create.restype = ctypes.c_void_p
+lgeos.GEOSCoordSeq_create.argtypes = [ctypes.c_uint, ctypes.c_uint]
+
+lgeos.GEOSCoordSeq_clone.restype = ctypes.c_void_p
+lgeos.GEOSCoordSeq_clone.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_destroy.restype = None
+lgeos.GEOSCoordSeq_destroy.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_setX.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_setX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+lgeos.GEOSCoordSeq_setY.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_setY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+lgeos.GEOSCoordSeq_setZ.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_setZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+lgeos.GEOSCoordSeq_setOrdinate.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_setOrdinate.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_double]
+
+lgeos.GEOSCoordSeq_getX.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_getY.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_getZ.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_getSize.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getSize.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSCoordSeq_getDimensions.restype = ctypes.c_int
+lgeos.GEOSCoordSeq_getDimensions.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSGeom_createPoint.restype = ctypes.c_void_p
+lgeos.GEOSGeom_createPoint.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_createLinearRing.restype = ctypes.c_void_p
+lgeos.GEOSGeom_createLinearRing.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_createLineString.restype = ctypes.c_void_p
+lgeos.GEOSGeom_createLineString.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_createPolygon.restype = ctypes.c_void_p
+lgeos.GEOSGeom_createPolygon.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_uint]
+
+lgeos.GEOSGeom_createCollection.restype = ctypes.c_void_p
+lgeos.GEOSGeom_createCollection.argtypes = [ctypes.c_int, ctypes.c_void_p, ctypes.c_uint]
+
+lgeos.GEOSGeom_clone.restype = ctypes.c_void_p
+lgeos.GEOSGeom_clone.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_destroy.restype = None
+lgeos.GEOSGeom_destroy.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSEnvelope.restype = ctypes.c_void_p
+lgeos.GEOSEnvelope.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSIntersection.restype = ctypes.c_void_p
+lgeos.GEOSIntersection.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSBuffer.restype = ctypes.c_void_p
+lgeos.GEOSBuffer.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_int]
+
+lgeos.GEOSConvexHull.restype = ctypes.c_void_p
+lgeos.GEOSConvexHull.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSDifference.restype = ctypes.c_void_p
+lgeos.GEOSDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSSymDifference.restype = ctypes.c_void_p
+lgeos.GEOSSymDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSBoundary.restype = ctypes.c_void_p
+lgeos.GEOSBoundary.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSUnion.restype = ctypes.c_void_p
+lgeos.GEOSUnion.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSPointOnSurface.restype = ctypes.c_void_p
+lgeos.GEOSPointOnSurface.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGetCentroid.restype = ctypes.c_void_p
+lgeos.GEOSGetCentroid.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSRelate.restype = ctypes.c_char_p
+lgeos.GEOSRelate.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSPolygonize.restype = ctypes.c_void_p
+lgeos.GEOSPolygonize.argtypes = [ctypes.c_void_p, ctypes.c_uint]
+
+lgeos.GEOSLineMerge.restype = ctypes.c_void_p
+lgeos.GEOSLineMerge.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSRelatePattern.restype = ctypes.c_char
+lgeos.GEOSRelatePattern.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_char_p]
+
+lgeos.GEOSDisjoint.restype = ctypes.c_int
+lgeos.GEOSDisjoint.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSTouches.restype = ctypes.c_int
+lgeos.GEOSTouches.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSIntersects.restype = ctypes.c_int
+lgeos.GEOSIntersects.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSCrosses.restype = ctypes.c_int
+lgeos.GEOSCrosses.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSWithin.restype = ctypes.c_int
+lgeos.GEOSWithin.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSContains.restype = ctypes.c_int
+lgeos.GEOSContains.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSOverlaps.restype = ctypes.c_int
+lgeos.GEOSOverlaps.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSEquals.restype = ctypes.c_int
+lgeos.GEOSEquals.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSisEmpty.restype = ctypes.c_int
+lgeos.GEOSisEmpty.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSisValid.restype = ctypes.c_int
+lgeos.GEOSisValid.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSisSimple.restype = ctypes.c_int
+lgeos.GEOSisSimple.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSisRing.restype = ctypes.c_int
+lgeos.GEOSisRing.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSHasZ.restype = ctypes.c_int
+lgeos.GEOSHasZ.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeomType.restype = ctypes.c_char_p
+lgeos.GEOSGeomType.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeomTypeId.restype = ctypes.c_int
+lgeos.GEOSGeomTypeId.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGetSRID.restype = ctypes.c_int
+lgeos.GEOSGetSRID.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSSetSRID.restype = None
+lgeos.GEOSSetSRID.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+lgeos.GEOSGetNumGeometries.restype = ctypes.c_int
+lgeos.GEOSGetNumGeometries.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGetGeometryN.restype = ctypes.c_void_p
+lgeos.GEOSGetGeometryN.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+lgeos.GEOSGetNumInteriorRings.restype = ctypes.c_int
+lgeos.GEOSGetNumInteriorRings.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGetInteriorRingN.restype = ctypes.c_void_p
+lgeos.GEOSGetInteriorRingN.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+lgeos.GEOSGetExteriorRing.restype = ctypes.c_void_p
+lgeos.GEOSGetExteriorRing.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGetNumCoordinates.restype = ctypes.c_int
+lgeos.GEOSGetNumCoordinates.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_getCoordSeq.restype = ctypes.c_void_p
+lgeos.GEOSGeom_getCoordSeq.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSGeom_getDimensions.restype = ctypes.c_int
+lgeos.GEOSGeom_getDimensions.argtypes = [ctypes.c_void_p]
+
+lgeos.GEOSArea.restype = ctypes.c_double
+lgeos.GEOSArea.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSLength.restype = ctypes.c_int
+lgeos.GEOSLength.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+lgeos.GEOSDistance.restype = ctypes.c_int
+lgeos.GEOSDistance.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]

{Shapely-1.0.7 → Shapely-1.0.12}/shapely/geos.py

@@ -3,12 +3,10 @@ Exports the libgeos_c shared lib, GEOS-specific exceptions, and utilities.
 """
 
 import atexit
-from ctypes import cdll, CDLL, pydll, PyDLL, CFUNCTYPE, c_char_p
-from ctypes.util import find_library
 import os
 import sys
-
-import shapely
+from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p
+from ctypes.util import find_library
 
 if sys.platform == 'win32':
     try:
@@ -31,13 +29,15 @@ elif sys.platform == 'darwin':
         lib_paths = [
             # The Framework build from Kyng Chaos:
             "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+            # macports
+            '/opt/local/lib/libgeos_c.dylib',
         ]
         for path in lib_paths:
             if os.path.exists(path):
                 lib = path
                 break
-            else:
-                raise ImportError, "Could not find geos_c library"
+    if lib is None:
+        raise ImportError, "Could not find geos_c library"
     lgeos = PyDLL(lib)
     free = CDLL(find_library('libc')).free
 else:
@@ -51,6 +51,10 @@ else:
     free = CDLL('libc.so.6').free
 
 
+# Load the ctypes restype and argtype declarations for geos_c functions.
+_here = os.path.abspath(os.path.dirname(__file__))
+execfile(os.path.join(_here, 'ctypes_declarations.py'))
+
 class allocated_c_char_p(c_char_p):
     pass
 
@@ -83,10 +87,9 @@ notice_h = CFUNCTYPE(None, c_char_p, c_char_p)(notice_handler)
 # Register a cleanup function
 
 def cleanup():
-    lgeos.finishGEOS()
+    if lgeos is not None:
+        lgeos.finishGEOS()
 
 atexit.register(cleanup)
 
 lgeos.initGEOS(notice_h, error_h)
-
-

{Shapely-1.0.7 → Shapely-1.0.12}/shapely/iterops.py

@@ -13,23 +13,17 @@ def geos_from_geometry(geom):
                         c_size_t(len(data))
                         )
 
-class BinaryPredicateIterator(object):
+
+class IterOp(object):
     
     """A generating non-data descriptor.
     """
-   
-    fn = None
-    context = None
-
+    
     def __init__(self, fn):
         self.fn = fn
-
-    def __get__(self, obj, objtype=None):
-        self.context = obj
-        return self
-
-    def __call__(self, geom, iterator, value=True):
-        if geom._geom is None:
+    
+    def __call__(self, context, iterator, value=True):
+        if context._geom is None:
             raise ValueError, "Null geometry supports no operations"
         for item in iterator:
             try:
@@ -39,18 +33,20 @@ class BinaryPredicateIterator(object):
                 ob = this_geom
             if not this_geom._geom:
                 raise ValueError, "Null geometry supports no operations"
-            retval = self.fn(geom._geom, this_geom._geom)
+            retval = self.fn(context._geom, this_geom._geom)
             if retval == 2:
-                raise PredicateError, "Failed to evaluate %s" % repr(self.fn)
+                raise PredicateError, \
+                    "Failed to evaluate %s" % repr(self.fn)
             elif bool(retval) == value:
                 yield ob
 
+
 # utilities
-disjoint = BinaryPredicateIterator(lgeos.GEOSDisjoint)
-touches = BinaryPredicateIterator(lgeos.GEOSTouches)
-intersects = BinaryPredicateIterator(lgeos.GEOSIntersects)
-crosses = BinaryPredicateIterator(lgeos.GEOSCrosses)
-within = BinaryPredicateIterator(lgeos.GEOSWithin)
-contains = BinaryPredicateIterator(lgeos.GEOSContains)
-overlaps = BinaryPredicateIterator(lgeos.GEOSOverlaps)
-equals = BinaryPredicateIterator(lgeos.GEOSEquals)
+disjoint = IterOp(lgeos.GEOSDisjoint)
+touches = IterOp(lgeos.GEOSTouches)
+intersects = IterOp(lgeos.GEOSIntersects)
+crosses = IterOp(lgeos.GEOSCrosses)
+within = IterOp(lgeos.GEOSWithin)
+contains = IterOp(lgeos.GEOSContains)
+overlaps = IterOp(lgeos.GEOSOverlaps)
+equals = IterOp(lgeos.GEOSEquals)

{Shapely-1.0.7 → Shapely-1.0.12}/shapely/predicates.py

@@ -4,7 +4,18 @@ Support for GEOS spatial predicates.
 
 from shapely.geos import PredicateError
 
-# Predicates
+
+class OpWrapper(object):
+    
+    def __init__(self, fn, context):
+        self.fn = fn
+        self.context = context
+        
+    def __call__(self, other):
+        if not other._geom:
+            raise ValueError, "Null geometry can not be operated upon"
+        return bool(self.fn(self.context._geom, other._geom))
+
 
 class BinaryPredicate(object):
     
@@ -25,13 +36,7 @@ class BinaryPredicate(object):
     def __get__(self, obj, objtype=None):
         if not obj._geom:
             raise ValueError, "Null geometry supports no operations"
-        self.context = obj
-        return self
-
-    def __call__(self, other):
-        if not other._geom:
-            raise ValueError, "Null geometry can not be operated upon"
-        return bool(self.fn(self.context._geom, other._geom))
+        return OpWrapper(self.fn, obj)
 
 
 # A data descriptor

{Shapely-1.0.7 → Shapely-1.0.12}/shapely/topology.py

@@ -5,44 +5,52 @@ Support for GEOS topological operations.
 from shapely.geos import TopologicalError
 
 
+class OpWrapper(object):
+    
+    def __init__(self, fn, context, factory):
+        self.fn = fn
+        self.context = context
+        self.factory = factory
+        
+    def __call__(self, other):
+        context = self.context
+        if other._geom is None:
+            raise ValueError, "Null geometry supports no operations"
+        product = self.fn(context._geom, other._geom)
+        if not product:
+            # Check validity of geometries
+            if not context.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the geometry %s" % (self.fn.__name__, repr(context))
+            elif not other.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the 'other' geometry %s" % (self.fn.__name__, repr(other))
+        return self.factory(product)
+        
+                    
 class BinaryTopologicalOp(object):
-
-    """A callable non-data descriptor.
-
+    
+    """A non-data descriptor that returns a callable.
+    
     Wraps a GEOS function. The factory is a callable which wraps results in
     the appropriate shapely geometry class.
     """
-
+    
     fn = None
-    context = None
     factory = None
-
+    
     def __init__(self, fn, factory):
         self.fn = fn
         self.factory = factory
-
+    
     def __get__(self, obj, objtype=None):
-        self.context = obj
-        return self
-
-    def __call__(self, other):
-        if self.context._geom is None or other._geom is None:
+        if not obj._geom:
             raise ValueError, "Null geometry supports no operations"
-        product = self.fn(self.context._geom, other._geom)
-        if not product:
-            # Check validity of geometries
-            if not self.context.is_valid:
-                raise TopologicalError, \
-                "The operation '%s' produced a null geometry. Likely cause is invalidity of the geometry %s" % (self.fn.__name__, repr(self.context))
-            elif not other.is_valid:
-                raise TopologicalError, \
-                "The operation '%s' produced a null geometry. Likely cause is invalidity of the 'other' geometry %s" % (self.fn.__name__, repr(other))
-
-        return self.factory(product, self.context)
+        return OpWrapper(self.fn, obj, self.factory)
 
 
 class UnaryTopologicalOp(object):
-
+    
     """A data descriptor.
     
     Wraps a GEOS function. The factory is a callable which wraps results in
@@ -51,11 +59,11 @@ class UnaryTopologicalOp(object):
     
     fn = None
     factory = None
-
+    
     def __init__(self, fn, factory):
         self.fn = fn
         self.factory = factory
-
+    
     def __get__(self, obj, objtype=None):
         if obj._geom is None:
             raise ValueError, "Null geometry supports no operations"

{Shapely-1.0.7 → Shapely-1.0.12}/shapely/wkt.py

@@ -32,7 +32,7 @@ def dumps(ob):
         return retval
     func.restype = allocated_c_char_p
     func.errcheck = errcheck
-    return lgeos.GEOSGeomToWKT(ob._geom)
+    return func(ob._geom)
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

{Shapely-1.0.7 → Shapely-1.0.12}/tests/attribute-chains.txt

@@ -8,7 +8,8 @@ See also ticket #151.
     >>> list(p.boundary.coords)
     [(0.0, 0.0), (0.0, 1.0), (-1.0, 1.0), (-1.0, 0.0), (0.0, 0.0)]
 
-    >>> print list(p.buffer(1).exterior.coords)
+    >>> from shapely.geometry import Point
+    >>> print list(Point(0.0, 0.0).buffer(1.0).exterior.coords)
     [(0.0, -1.0), (-1.0, -1.0), ...
 
 Test chained access to interiors

{Shapely-1.0.7 → Shapely-1.0.12}/tests/test_doctests.py

@@ -8,6 +8,7 @@ optionflags = (doctest.REPORT_ONLY_FIRST_FAILURE |
                doctest.ELLIPSIS)
 
 def list_doctests():
+    print __file__
     return [filename
             for filename
             in glob.glob(os.path.join(os.path.dirname(__file__), '*.txt'))]

Shapely-1.0.12/tests/wkt_locale.txt

@@ -0,0 +1,26 @@
+Test locale independence of WKT
+===============================
+
+Set locale to one that uses a comma as decimal seperator`
+
+  >>> import locale
+  >>> locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8')
+  'pt_BR.UTF-8'
+
+Test reading and writing`
+
+  >>> from shapely.wkt import loads
+  >>> p = loads('POINT (0.0 0.0)')
+  >>> p.x == 0.0
+  True
+  >>> p.y == 0.0
+  True
+  >>> p.wkt
+  'POINT (0.0...)'
+  >>> from shapely.wkt import dumps
+  >>> dumps(p)
+  'POINT (0.0...)'
+
+Reset locale
+
+  >>> _ = locale.setlocale(locale.LC_ALL, '')