shapely 1.0.7__tar.gz → 1.0.11__tar.gz

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

@@ -1,5 +1,23 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+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.11/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.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.7
+Version: 1.0.11
 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.11}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.7
+Version: 1.0.11
 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.11}/Shapely.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 CHANGES.txt
 CREDITS.txt
+GEOS-C-API.txt
 HISTORY.txt
 LICENSE.txt
 README.txt
@@ -15,6 +16,7 @@ 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-1.0.7 → Shapely-1.0.11}/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.11',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.7 → Shapely-1.0.11}/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.11',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

Shapely-1.0.11/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.11}/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)
-
-