shapely 1.2.9__tar.gz → 1.2.12__tar.gz

{Shapely-1.2.9 → Shapely-1.2.12}/CHANGES.txt

@@ -2,6 +2,28 @@
 CHANGES
 =======
 
+1.2.12 (2011-08-15)
+-------------------
+- Build Windows distributions with VC7 or VC9 as appropriate.
+- More verbose report on failure to speed up.
+- Fix for prepared geometries broken in 1.2.11.
+- DO NOT INSTALL 1.2.11
+
+1.2.11 (2011-08-04)
+-------------------
+- Ignore AttributeError during exit.
+- PyPy 1.5 support.
+- Prevent operation on prepared geometry crasher (#12).
+- Optional Cython speedups for Windows.
+- Linux 3 platform support.
+
+1.2.10 (2011-05-09)
+-------------------
+- Add optional Cython speedups.
+- Add is_cww predicate to LinearRing.
+- Add function that forces orientation of Polygons.
+- Disable build of speedups on Windows pending packaging work.
+
 1.2.9 (2011-03-31)
 ------------------
 - Remove extra glob import.

{Shapely-1.2.9 → Shapely-1.2.12}/CREDITS.txt

@@ -3,6 +3,7 @@ Shapely is written by:
 * Sean Gillies
 * Aron Bierbaum
 * Kai Lautaportti
+* Oliver Tonnhofer
 
 Patches contributed by:
 
@@ -11,7 +12,6 @@ Patches contributed by:
 * Eric Lemoine
 * Jonathan Tartley
 * Kristian Thy
-* Oliver Tonnhofer
 
 Additional help from:
 
@@ -22,3 +22,5 @@ Additional help from:
 
 Major portions of this work were supported by a grant (for Pleiades_) from the
 U.S. National Endowment for the Humanities (http://www.neh.gov).
+
+.. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2.9/Shapely.egg-info → Shapely-1.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.9
+Version: 1.2.12
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,28 @@ Description: ======
         CHANGES
         =======
         
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
+        1.2.10 (2011-05-09)
+        -------------------
+        - Add optional Cython speedups.
+        - Add is_cww predicate to LinearRing.
+        - Add function that forces orientation of Polygons.
+        - Disable build of speedups on Windows pending packaging work.
+        
         1.2.9 (2011-03-31)
         ------------------
         - Remove extra glob import.

{Shapely-1.2.9 → Shapely-1.2.12/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.9
+Version: 1.2.12
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,28 @@ Description: ======
         CHANGES
         =======
         
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
+        1.2.10 (2011-05-09)
+        -------------------
+        - Add optional Cython speedups.
+        - Add is_cww predicate to LinearRing.
+        - Add function that forces orientation of Polygons.
+        - Disable build of speedups on Windows pending packaging work.
+        
         1.2.9 (2011-03-31)
         ------------------
         - Remove extra glob import.

{Shapely-1.2.9 → Shapely-1.2.12}/Shapely.egg-info/SOURCES.txt

@@ -24,6 +24,8 @@ shapely/topology.py
 shapely/validation.py
 shapely/wkb.py
 shapely/wkt.py
+shapely/algorithms/__init__.py
+shapely/algorithms/cga.py
 shapely/examples/__init__.py
 shapely/examples/dissolve.py
 shapely/examples/geoms.py
@@ -40,6 +42,9 @@ shapely/geometry/multipolygon.py
 shapely/geometry/point.py
 shapely/geometry/polygon.py
 shapely/geometry/proxy.py
+shapely/speedups/__init__.py
+shapely/speedups/_speedups.c
+shapely/speedups/_speedups.pyx
 shapely/tests/Array.txt
 shapely/tests/GeoInterface.txt
 shapely/tests/IterOps.txt
@@ -61,6 +66,7 @@ shapely/tests/invalid_intersection.txt
 shapely/tests/linemerge.txt
 shapely/tests/polygonize.txt
 shapely/tests/test_box.py
+shapely/tests/test_cga.py
 shapely/tests/test_collection.py
 shapely/tests/test_delegated.py
 shapely/tests/test_dlls.py
@@ -73,6 +79,7 @@ shapely/tests/test_mapping.py
 shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py
+shapely/tests/test_speedups.py
 shapely/tests/test_validation.py
 shapely/tests/test_xy.py
 shapely/tests/threading_test.py

{Shapely-1.2.9 → Shapely-1.2.12}/docs/manual.txt

@@ -3,8 +3,8 @@ The Shapely User Manual
 =======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.9
-:Date: 31 March 2011
+:Revision: 1.2.10
+:Date: 2 May 2011
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -493,6 +493,17 @@ For example:
 
 This is the first appearance of an explicit polygon handedness in Shapely.
 
+To obtain a polygon with a known orientation, use 
+:func:`shapely.geometry.polygon.orient()`:
+
+.. function:: shapely.geometry.polygon.orient(polygon, sign=1.0)
+
+  Returns a properly oriented copy of the given polygon. The signed area of the
+  result will have the given sign. A sign of 1.0 means that the coordinates of the
+  product's exterior ring will be oriented counter-clockwise.
+
+  `New in version 1.2.10`.
+
 .. _collections:
 
 Collections
@@ -835,6 +846,29 @@ example will be shown for each.
   >>> Point(0, 0, 0).has_z
   True
 
+.. attribute:: object.is_ccw
+
+  Returns ``True`` if coordinates are in counter-clockwise order (bounding a region
+  with positive signed area). This method applies to `LinearRing` objects only.
+
+  `New in version 1.2.10`.
+
+.. sourcecode:: pycon
+
+  >>> LinearRing([(1,0), (1,1), (0,0)]).is_ccw
+  True
+
+A ring with an undesired orientation can be reversed like this:
+
+.. sourcecode:: pycon
+
+  >>> ring = LinearRing([(0,0), (1,1), (1,0)])
+  >>> ring.is_ccw
+  False
+  >>> ring.coords = list(ring.coords)[::-1]
+  >>> ring.is_ccw
+  True
+
 .. attribute:: object.is_empty
 
   Returns ``True`` if the feature's `interior` and `boundary` (in point set
@@ -1756,6 +1790,34 @@ For example, using the same `GeoThing` class:
   >>> m['coordinates']
   (0.0, 0.0)}
 
+
+Performance
+===========
+
+Shapely uses the GEOS_ library for all operations. GEOS is written in C++ and
+used in many applications and you can expect that all operations are highly
+optimized. Only the creation of new geometries involves some overhead that
+might slow down your code, if you create lots of geometries with a large number
+of coordinates.
+
+.. versionadded:: 1.2.10
+
+The :mod:`shapely.speedups` module contains performance enhancements written
+in C. They are automaticaly installed when Python has access to a compiler
+during installation.
+
+You can check if the speedups are installed with the :attr:`available`
+attribute. To enable the speedups call :func:`enable`. You can revert to the
+default implementation with :func:`disable`.
+
+.. sourcecode:: pycon
+
+  >>> from shapely import speedups
+  >>> speedups.available
+  True
+  >>> speedups.enable()
+
+
 Conclusion
 ==========
 

Shapely-1.2.12/setup.py

@@ -0,0 +1,129 @@
+import glob
+import warnings
+
+try:
+    from distribute_setup import use_setuptools
+    use_setuptools()
+except:
+    warnings.warn(
+    "Failed to import distribute_setup, continuing without distribute.", 
+    Warning)
+
+from distutils.errors import CCompilerError, DistutilsExecError, \
+    DistutilsPlatformError
+from setuptools.extension import Extension
+from setuptools.command.build_ext import build_ext
+from setuptools import setup, find_packages
+import sys
+import platform
+
+readme_text = file('README.txt', 'rb').read()
+changes_text = file('CHANGES.txt', 'rb').read()
+
+setup_args = dict(
+    metadata_version    = '1.2',
+    name                = 'Shapely',
+    version             = '1.2.12',
+    requires_python     = '>=2.5,<3',
+    requires_external   = 'libgeos_c (>=3.1)', 
+    description         = 'Geometric objects, predicates, and operations',
+    license             = 'BSD',
+    keywords            = 'geometry topology gis',
+    author              = 'Sean Gillies',
+    author_email        = 'sean.gillies@gmail.com',
+    maintainer          = 'Sean Gillies',
+    maintainer_email    = 'sean.gillies@gmail.com',
+    url                 = 'http://trac.gispython.org/lab/wiki/Shapely',
+    long_description    = readme_text + "\n" + changes_text,
+    packages            = find_packages(),
+    test_suite          = 'shapely.tests.test_suite',
+    classifiers         = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: GIS',
+        ],
+    )
+
+# Add DLLs for Windows
+if sys.platform == 'win32':
+    if '(AMD64)' in sys.version:
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_AMD64_VC9/*.dll'))]
+            )
+    elif platform.python_version().startswith('2.5.'):
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC7/*.dll'))]
+            )       
+    else:
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC9/*.dll'))]
+            )
+
+
+# Optional compilation of speedups
+# setuptools stuff from Bob Ippolito's simplejson project
+if sys.platform == 'win32' and sys.version_info > (2, 6):
+   # 2.6's distutils.msvc9compiler can raise an IOError when failing to
+   # find the compiler
+   ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError,
+                 IOError)
+else:
+   ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
+
+class BuildFailed(Exception):
+    pass
+
+class ve_build_ext(build_ext):
+    # This class allows C extension building to fail.
+
+    def run(self):
+        try:
+            build_ext.run(self)
+        except DistutilsPlatformError, x:
+            raise BuildFailed(x)
+
+    def build_extension(self, ext):
+        try:
+            build_ext.build_extension(self, ext)
+        except ext_errors, x:
+            raise BuildFailed(x)
+
+if sys.platform == 'win32':
+    # geos DLL is geos.dll instead of geos_c.dll on Windows
+    ext_modules = [
+        Extension("shapely.speedups._speedups",
+              ["shapely/speedups/_speedups.c"], libraries=['geos']),
+    ]
+elif (hasattr(platform, 'python_implementation') 
+    and platform.python_implementation() == 'PyPy'):
+    # python_implementation >= 2.6
+    ext_modules = []
+else:
+    ext_modules = [
+        Extension("shapely.speedups._speedups", 
+              ["shapely/speedups/_speedups.c"], libraries=['geos_c']),
+    ]
+
+try:
+    # try building with speedups
+    setup(
+        cmdclass={'build_ext': ve_build_ext},
+        ext_modules=ext_modules,
+        **setup_args
+    )
+except BuildFailed, ex:
+    BUILD_EXT_WARNING = "Warning: The C extension could not be compiled, speedups are not enabled."
+    print ex
+    print BUILD_EXT_WARNING
+    print "Failure information, if any, is above."
+    print "I'm retrying the build without the C extension now."
+
+    setup(**setup_args)
+
+    print BUILD_EXT_WARNING
+    print "Plain-Python installation succeeded."
+

Shapely-1.2.12/shapely/algorithms/cga.py

@@ -0,0 +1,17 @@
+from itertools import islice, izip
+
+def signed_area(ring):
+    """Return the signed area enclosed by a ring in linear time using the 
+    algorithm at: http://www.cgafaq.info/wiki/Polygon_Area.
+    """
+    xs, ys = ring.coords.xy
+    xs.append(xs[1])
+    ys.append(ys[1])
+    return sum(xs[i]*(ys[i+1]-ys[i-1]) for i in range(1, len(ring.coords)))/2.0
+
+def is_ccw_impl(name):
+    """Predicate implementation"""
+    def is_ccw_op(ring):
+        return signed_area(ring) >= 0.0
+    return is_ccw_op
+

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/ctypes_declarations.py

@@ -6,12 +6,17 @@ import ctypes
 class allocated_c_char_p(ctypes.c_char_p):
     pass
 
+EXCEPTION_HANDLER_FUNCTYPE = ctypes.CFUNCTYPE(None, ctypes.c_char_p, ctypes.c_char_p)
+
 def prototype(lgeos, geosVersion):
 
+    lgeos.initGEOS.argtypes = [EXCEPTION_HANDLER_FUNCTYPE, EXCEPTION_HANDLER_FUNCTYPE]
     lgeos.initGEOS.restype = None
 
+    lgeos.finishGEOS.argtypes = []
     lgeos.finishGEOS.restype = None
 
+    lgeos.GEOSversion.argtypes = []
     lgeos.GEOSversion.restype = ctypes.c_char_p
 
     lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/geometry/base.py

@@ -104,7 +104,10 @@ class BaseGeometry(object):
         # TODO: defer cleanup to the implementation. We shouldn't be
         # explicitly calling a lgeos method here.
         if not (self._owned or self._is_empty):
-            self._lgeos.GEOSGeom_destroy(self.__geom__)
+            try:
+                self._lgeos.GEOSGeom_destroy(self.__geom__)
+            except AttributeError:
+                pass # _lgeos might be empty on shutdown
         self.__geom__ = EMPTY
 
     def __del__(self):

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/geometry/linestring.py

@@ -167,9 +167,10 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Create a coordinate sequence
@@ -226,21 +227,15 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         # add to coordinate sequence
         for i in xrange(m):
             coords = ob[i]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
+            # Because of a bug in the GEOS C API, 
+            # always set X before Y
+            lgeos.GEOSCoordSeq_setX(cs, i, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, i, coords[1])
             if n == 3:
                 try:
-                    dz = c_double(coords[2])
+                    lgeos.GEOSCoordSeq_setZ(cs, i, coords[2])
                 except IndexError:
                     raise ValueError("Inconsistent coordinate dimensionality")
-        
-            # Because of a bug in the GEOS C API, 
-            # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
-            if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
     
     if update_geom is not None:
         return None

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/geometry/multilinestring.py

@@ -93,9 +93,6 @@ def geos_multilinestring_from_py(ob):
         L = array['shape'][0]
         assert L >= 1
 
-        # Make pointer to the coordinate array
-        cp = cast(array['data'][0], POINTER(c_double))
-
         # Array of pointers to sub-geometries
         subs = (c_void_p * L)()
 

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/geometry/multipoint.py

@@ -138,9 +138,10 @@ def geos_multipoint_from_py(ob):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Array of pointers to sub-geometries

{Shapely-1.2.9 → Shapely-1.2.12}/shapely/geometry/polygon.py

@@ -4,6 +4,8 @@
 from ctypes import c_double, c_void_p, cast, POINTER
 from ctypes import ArgumentError
 import weakref
+
+from shapely.algorithms.cga import signed_area
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry
 from shapely.geometry.linestring import LineString, LineStringAdapter
@@ -61,6 +63,11 @@ class LinearRing(LineString):
 
     coords = property(_get_coords, _set_coords)
 
+    @property
+    def is_ccw(self):
+        """Brand new"""
+        return bool(self.impl['is_ccw'](self))
+
 
 class LinearRingAdapter(LineStringAdapter):
 
@@ -277,6 +284,20 @@ def asPolygon(shell, holes=None):
     """Adapt objects to the Polygon interface"""
     return PolygonAdapter(shell, holes)
 
+def orient(polygon, sign=1.0):
+    s = float(sign)
+    rings = []
+    ring = polygon.exterior
+    if signed_area(ring)/s >= 0.0:
+        rings.append(ring)
+    else:
+        rings.append(list(ring.coords)[::-1])
+    for ring in polygon.interiors:
+        if signed_area(ring)/s <= 0.0:
+            rings.append(ring)
+        else:
+            rings.append(list(ring.coords)[::-1])
+    return Polygon(rings[0], rings[1:])
 
 def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
     try:
@@ -291,9 +312,10 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Add closing coordinates to sequence?
@@ -314,33 +336,21 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
 
         # add to coordinate sequence
         for i in xrange(m):
-            dx = c_double(cp[n*i])
-            dy = c_double(cp[n*i+1])
-            dz = None
-            if n == 3:
-                dz = c_double(cp[n*i+2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
+            lgeos.GEOSCoordSeq_setX(cs, i, cp[n*i])
+            lgeos.GEOSCoordSeq_setY(cs, i, cp[n*i+1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, i, cp[n*i+2])
 
         # Add closing coordinates to sequence?
-        if M > m:
-            dx = c_double(cp[0])
-            dy = c_double(cp[1])
-            dz = None
-            if n == 3:
-                dz = c_double(cp[2])
-        
+        if M > m:        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, M-1, dx)
-            lgeos.GEOSCoordSeq_setY(cs, M-1, dy)
+            lgeos.GEOSCoordSeq_setX(cs, M-1, cp[0])
+            lgeos.GEOSCoordSeq_setY(cs, M-1, cp[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, M-1, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, M-1, cp[2])
             
     except AttributeError:
         # Fall back on list
@@ -370,34 +380,25 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         # add to coordinate sequence
         for i in xrange(m):
             coords = ob[i]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
-            if n == 3:
-                dz = c_double(coords[2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
+            lgeos.GEOSCoordSeq_setX(cs, i, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, i, coords[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
+                try:
+                    lgeos.GEOSCoordSeq_setZ(cs, i, coords[2])
+                except IndexError:
+                    raise ValueError("Inconsistent coordinate dimensionality")
 
         # Add closing coordinates to sequence?
         if M > m:
             coords = ob[0]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
-            if n == 3:
-                dz = c_double(coords[2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, M-1, dx)
-            lgeos.GEOSCoordSeq_setY(cs, M-1, dy)
+            lgeos.GEOSCoordSeq_setX(cs, M-1, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, M-1, coords[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, M-1, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, M-1, coords[2])
 
     if update_geom is not None:
         return None