shapely 1.2.8__py2.5-win32.egg → 1.2.10__py2.5-win32.egg

EGG-INFO/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.8
+Version: 1.2.10
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: =======
-        Shapely
-        =======
+Description: ======
+        README
+        ======
         
         .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
         :width: 800
@@ -162,6 +162,206 @@ Description: =======
         :trim:
         .. _Pleiades: http://pleiades.stoa.org
         
+        =======
+        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.
+        - Move examples to shapely.examples.
+        - Add box() constructor for rectangular polygons.
+        - Fix extraneous imports.
+        
+        1.2.8 (2011-12-03)
+        ------------------
+        - New parallel_offset method (#6).
+        - Support for Python 2.4.
+        
+        1.2.7 (2010-11-05)
+        ------------------
+        - Support for Windows eggs.
+        
+        1.2.6 (2010-10-21)
+        ------------------
+        - The geoms property of an empty collection yields [] instead of a ValueError
+        (#3).
+        - The coords and geometry type sproperties have the same behavior as above.
+        - Ensure that z values carry through into products of operations (#4).
+        
+        1.2.5 (2010-09-19)
+        ------------------
+        - Stop distributing docs/_build.
+        - Include library fallbacks in test_dlls.py for linux platform.
+        
+        1.2.4 (2010-09-09)
+        ------------------
+        - Raise AttributeError when there's no backend support for a method.
+        - Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
+        - Add geos_c DLL loading support for linux platforms where find_library doesn't
+        work.
+        
+        1.2.3 (2010-08-17)
+        ------------------
+        - Add mapping function.
+        - Fix problem with GEOSisValidReason symbol for GEOS < 3.1.
+        
+        1.2.2 (2010-07-23)
+        ------------------
+        - Add representative_point method.
+        
+        1.2.1 (2010-06-23)
+        ------------------
+        - Fixed bounds of singular polygons.
+        - Added shapely.validation.explain_validity function (#226).
+        
+        1.2 (2010-05-27)
+        ----------------
+        - Final release.
+        
+        1.2rc2 (2010-05-26)
+        -------------------
+        - Add examples and tests to MANIFEST.in.
+        - Release candidate 2.
+        
+        1.2rc1 (2010-05-25)
+        -------------------
+        - Release candidate.
+        
+        1.2b7 (2010-04-22)
+        ------------------
+        - Memory leak associated with new empty geometry state fixed.
+        
+        1.2b6 (2010-04-13)
+        ------------------
+        - Broken GeometryCollection fixed.
+        
+        1.2b5 (2010-04-09)
+        ------------------
+        - Objects can be constructed from others of the same type, thereby making
+        copies. Collections can be constructed from sequences of objects, also making
+        copies.
+        - Collections are now iterators over their component objects.
+        - New code for manual figures, using the descartes package.
+        
+        1.2b4 (2010-03-19)
+        ------------------
+        - Adds support for the "sunos5" platform.
+        
+        1.2b3 (2010-02-28)
+        ------------------
+        - Only provide simplification implementations for GEOS C API >= 1.5.
+        
+        1.2b2 (2010-02-19)
+        ------------------
+        - Fix cascaded_union bug introduced in 1.2b1 (#212).
+        
+        1.2b1 (2010-02-18)
+        ------------------
+        - Update the README. Remove cruft from setup.py. Add some version 1.2 metadata
+        regarding required Python version (>=2.5,<3) and external dependency
+        (libgeos_c >= 3.1).
+        
+        1.2a6 (2010-02-09)
+        ------------------
+        - Add accessor for separate arrays of X and Y values (#210).
+        
+        TODO: fill gap here
+        
+        1.2a1 (2010-01-20)
+        ------------------
+        - Proper prototyping of WKB writer, and avoidance of errors on 64-bit systems
+        (#191).
+        - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
+        (#189).
+        
+        =========================
+        1.2 Branched (2009-09-19)
+        =========================
+        
+        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).
+        - Eliminated reference cycles in polygons (#169).
+        
+        1.0.6 (2008-07-10)
+        ------------------
+        - Fixed adaptation of multi polygon data.
+        - Raise exceptions earlier from binary predicates.
+        - Beginning distributing new windows DLLs (#166).
+        
+        1.0.5 (2008-05-20)
+        ------------------
+        - Added access to GEOS polygonizer function.
+        - Raise exception when insufficient coordinate tuples are passed to LinearRing
+        constructor (#164).
+        
+        1.0.4 (2008-05-01)
+        ------------------
+        - Disentangle Python and topological equality (#163).
+        - Add shape(), a factory that copies coordinates from a geo interface provider.
+        To be used instead of asShape() unless you really need to store coordinates
+        outside shapely for efficient use in other code.
+        - Cache GEOS geometries in adapters (#163).
+        
+        1.0.3 (2008-04-09)
+        ------------------
+        - Do not release GIL when calling GEOS functions (#158).
+        - Prevent faults when chaining multiple GEOS operators (#159).
+        
+        1.0.2 (2008-02-26)
+        ------------------
+        - Fix loss of dimensionality in polygon rings (#155).
+        
+        1.0.1 (2008-02-08)
+        ------------------
+        - Allow chaining expressions involving coordinate sequences and geometry parts
+        (#151).
+        - Protect against abnormal use of coordinate accessors (#152).
+        - Coordinate sequences now implement the numpy array protocol (#153).
+        
+        1.0 (2008-01-18)
+        ----------------
+        - Final release.
+        
+        1.0 RC2 (2008-01-16)
+        --------------------
+        - Added temporary solution for #149.
+        
+        1.0 RC1 (2008-01-14)
+        --------------------
+        - First release candidate
+        
+        
 Keywords: geometry topology gis
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable

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/coords.py

@@ -2,8 +2,7 @@
 """
 
 from array import array
-from ctypes import string_at, byref, c_char_p, c_double, c_void_p
-from ctypes import c_int, c_size_t, c_uint
+from ctypes import byref, c_double, c_uint
 import sys
 
 from shapely.geos import lgeos

shapely/geometry/__init__.py

@@ -1,7 +1,7 @@
 """Geometry classes and factories
 """
 
-from geo import shape, asShape, mapping
+from geo import box, shape, asShape, mapping
 from point import Point, asPoint
 from linestring import LineString, asLineString
 from polygon import Polygon, asPolygon
@@ -11,7 +11,7 @@ from multipolygon import MultiPolygon, asMultiPolygon
 from collection import GeometryCollection
 
 __all__ = [
-    'shape', 'asShape', 'Point', 'asPoint', 'LineString', 'asLineString',
+    'box', 'shape', 'asShape', 'Point', 'asPoint', 'LineString', 'asLineString',
     'Polygon', 'asPolygon', 'MultiPoint', 'asMultiPoint',
     'MultiLineString', 'asMultiLineString', 'MultiPolygon', 'asMultiPolygon',
     'GeometryCollection', 'mapping'

shapely/geometry/geo.py

@@ -7,9 +7,16 @@ from linestring import LineString, asLineString
 from polygon import Polygon, asPolygon
 from multipoint import MultiPoint, asMultiPoint
 from multilinestring import MultiLineString, asMultiLineString
-from multipolygon import MultiPolygon, MultiPolygonAdapter, asMultiPolygon
+from multipolygon import MultiPolygon, MultiPolygonAdapter
 
 
+def box(minx, miny, maxx, maxy, ccw=True):
+    """Return a rectangular polygon with configurable normal vector"""
+    coords = [(maxx, miny), (maxx, maxy), (minx, maxy), (minx, miny)]
+    if not ccw:
+        coords = coords[::-1]
+    return Polygon(coords)
+
 def shape(context):
     """Return a new, independent geometry with coordinates *copied* from the
     context.

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/geometry/proxy.py

@@ -23,7 +23,6 @@ class CachingGeometryProxy(object):
 
     def empty(self):
         if not self._is_empty:
-            from shapely.geos import lgeos
             lgeos.GEOSGeom_destroy(self.__geom__)
         self.__geom__ = EMPTY
 

shapely/geos.py

@@ -6,10 +6,9 @@ import atexit
 import logging
 import os
 import sys
-import time
 import threading
 import ctypes
-from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p, c_void_p, string_at
+from ctypes import cdll, CDLL, CFUNCTYPE, c_char_p, c_void_p, string_at
 from ctypes.util import find_library
 
 import ftools

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/iterops.py

@@ -3,7 +3,7 @@ Iterative forms of operations
 """
 
 from ctypes import c_char_p, c_size_t
-from shapely.geos import lgeos, free
+from shapely.geos import lgeos, PredicateError
 
 
 def geos_from_geometry(geom):

shapely/predicates.py

@@ -2,7 +2,6 @@
 Support for GEOS spatial predicates
 """
 
-from shapely.geos import PredicateError, lgeos
 from shapely.topology import Delegating
 
 class BinaryPredicate(Delegating):

shapely/wkb.py

@@ -1,8 +1,7 @@
 """Load/dump geometries using the well-known binary (WKB) format
 """
 
-from ctypes import byref, c_size_t, c_char_p, string_at
-from ctypes import c_void_p, c_size_t
+from ctypes import byref, c_size_t, c_char_p, c_void_p
 
 from shapely.geos import lgeos, ReadingError
 

EGG-INFO/scripts/dissolve.py

@@ -1,53 +0,0 @@
-# dissolve.py
-#
-# Demonstrate how Shapely can be used to build up a collection of patches by 
-# dissolving circular regions and how Shapely supports plotting of the results.
-
-from functools import partial
-import random
-
-import pylab
-
-from shapely.geometry import Point
-from shapely.ops import cascaded_union
-
-# Use a partial function to make 100 points uniformly distributed in a 40x40 
-# box centered on 0,0.
-r = partial(random.uniform, -20.0, 20.0)
-points = [Point(r(), r()) for i in range(100)]
-
-# Buffer the points, producing 100 polygon spots
-spots = [p.buffer(2.5) for p in points]
-
-# Perform a cascaded union of the polygon spots, dissolving them into a 
-# collection of polygon patches
-patches = cascaded_union(spots)
-
-if __name__ == "__main__":
-    # Illustrate the results using matplotlib's pylab interface
-    pylab.figure(num=None, figsize=(4, 4), dpi=180)
-    
-    for patch in patches.geoms:
-        assert patch.geom_type in ['Polygon']
-        assert patch.is_valid
-    
-        # Fill and outline each patch
-        x, y = patch.exterior.xy
-        pylab.fill(x, y, color='#cccccc', aa=True) 
-        pylab.plot(x, y, color='#666666', aa=True, lw=1.0)
-    
-        # Do the same for the holes of the patch
-        for hole in patch.interiors:
-            x, y = hole.xy
-            pylab.fill(x, y, color='#ffffff', aa=True) 
-            pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-    
-    # Plot the original points
-    pylab.plot([p.x for p in points], [p.y for p in points], 'b,', alpha=0.75)
-    
-    # Write the number of patches and the total patch area to the figure
-    pylab.text(-25, 25, 
-        "Patches: %d, total area: %.2f" % (len(patches.geoms), patches.area))
-    
-    pylab.savefig('dissolve.png')
-    

EGG-INFO/scripts/intersect.py

@@ -1,81 +0,0 @@
-# intersect.py
-#
-# Demonstrate how Shapely can be used to analyze and plot the intersection of
-# a trajectory and regions in space.
-
-from functools import partial
-import random
-
-import pylab
-
-from shapely.geometry import LineString, Point
-from shapely.ops import cascaded_union
-
-# Build patches as in dissolved.py
-r = partial(random.uniform, -20.0, 20.0)
-points = [Point(r(), r()) for i in range(100)]
-spots = [p.buffer(2.5) for p in points]
-patches = cascaded_union(spots)
-
-# Represent the following geolocation parameters
-#
-# initial position: -25, -25
-# heading: 45.0
-# speed: 50*sqrt(2)
-#
-# as a line
-vector = LineString(((-25.0, -25.0), (25.0, 25.0)))
-
-# Find intercepted and missed patches. List the former so we can count them
-# later
-intercepts = [patch for patch in patches.geoms if vector.intersects(patch)]
-misses = (patch for patch in patches.geoms if not vector.intersects(patch))
-
-# Plot the intersection
-intersection = vector.intersection(patches)
-assert intersection.geom_type in ['MultiLineString']
-
-if __name__ == "__main__":
-    # Illustrate the results using matplotlib's pylab interface
-    pylab.figure(num=None, figsize=(4, 4), dpi=180)
-    
-    # Plot the misses
-    for spot in misses:
-        x, y = spot.exterior.xy
-        pylab.fill(x, y, color='#cccccc', aa=True) 
-        pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-    
-        # Do the same for the holes of the patch
-        for hole in spot.interiors:
-            x, y = hole.xy
-            pylab.fill(x, y, color='#ffffff', aa=True) 
-            pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-    
-    # Plot the intercepts
-    for spot in intercepts:
-        x, y = spot.exterior.xy
-        pylab.fill(x, y, color='red', alpha=0.25, aa=True) 
-        pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
-    
-        # Do the same for the holes of the patch
-        for hole in spot.interiors:
-            x, y = hole.xy
-            pylab.fill(x, y, color='#ffffff', aa=True) 
-            pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
-    
-    # Draw the projected trajectory
-    pylab.arrow(-25, -25, 50, 50, color='#999999', aa=True,
-        head_width=1.0, head_length=1.0)
-    
-    for segment in intersection.geoms:
-        x, y = segment.xy
-        pylab.plot(x, y, color='red', aa=True, lw=1.5)
-    
-    # Write the number of patches and the total patch area to the figure
-    pylab.text(-28, 25, 
-        "Patches: %d/%d (%d), total length: %.1f" \
-         % (len(intercepts), len(patches.geoms), 
-            len(intersection.geoms), intersection.length))
-    
-    pylab.savefig('intersect.png')
-