shapely 1.2.9__tar.gz → 1.2.10__tar.gz

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

@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+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.egg-info → Shapely-1.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.9
+Version: 1.2.10
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,13 @@ Description: ======
         CHANGES
         =======
         
+        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.10/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.9
+Version: 1.2.10
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,13 @@ Description: ======
         CHANGES
         =======
         
+        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.10}/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.10}/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.10/setup.py

@@ -0,0 +1,116 @@
+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
+
+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.10',
+    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/*.dll'))]
+            )
+    else:
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_x86/*.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':
+    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.10/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.10}/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:

{Shapely-1.2.9 → Shapely-1.2.10}/shapely/impl.py

@@ -13,6 +13,7 @@ Shapely 1.2 includes a GEOS backend and it is the default.
 
 from ftools import wraps
 
+from shapely.algorithms import cga
 from shapely.coords import BoundsOp
 from shapely.geos import lgeos
 from shapely.linref import ProjectOp, InterpolateOp
@@ -81,6 +82,9 @@ IMPL14 = {
     'touches': (BinaryPredicate, 'touches'),
     'within': (BinaryPredicate, 'within'),
     'equals_exact': (BinaryPredicate, 'equals_exact'),
+    
+    # First pure Python implementation
+    'is_ccw': (cga.is_ccw_impl, 'is_ccw'),
     }
 
 IMPL15 = {

Shapely-1.2.10/shapely/speedups/__init__.py

@@ -0,0 +1,39 @@
+import warnings
+
+from shapely.geometry import linestring, polygon
+from shapely import coords
+
+try:
+    from shapely.speedups import _speedups
+    available = True
+except ImportError:
+    available = False
+
+__all__ = ['available', 'enable', 'disable']
+_orig = {}
+
+def enable():
+    if not available:
+        warnings.warn("shapely.speedups not available", RuntimeWarning)
+        return
+    
+    if _orig:
+        return
+    
+    _orig['CoordinateSequence.ctypes'] = coords.CoordinateSequence.ctypes
+    coords.CoordinateSequence.ctypes = property(_speedups.coordseq_ctypes)
+    
+    _orig['geos_linestring_from_py'] = linestring.geos_linestring_from_py
+    linestring.geos_linestring_from_py = _speedups.geos_linestring_from_py
+
+    _orig['geos_linearring_from_py']  = polygon.geos_linearring_from_py
+    polygon.geos_linearring_from_py = _speedups.geos_linearring_from_py
+
+def disable():
+    if not _orig:
+        return
+
+    coords.CoordinateSequence.ctypes = _orig['CoordinateSequence.ctypes']
+    linestring.geos_linestring_from_py = _orig['geos_linestring_from_py']
+    polygon.geos_linearring_from_py = _orig['geos_linearring_from_py']
+    _orig.clear()