shapely 1.0.4__tar.gz → 1.0.5__tar.gz

{Shapely-1.0.4 → Shapely-1.0.5}/CHANGES.txt

@@ -1,5 +1,11 @@
 All tickets are children of http://trac.gispython.org/projects/PCL/ticket/
 
+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).

{Shapely-1.0.4 → Shapely-1.0.5}/PKG-INFO

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

{Shapely-1.0.4 → Shapely-1.0.5}/Shapely.egg-info/PKG-INFO

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

{Shapely-1.0.4 → Shapely-1.0.5}/Shapely.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ shapely/__init__.py
 shapely/geos.py
 shapely/iterops.py
 shapely/kml.py
+shapely/ops.py
 shapely/predicates.py
 shapely/topology.py
 shapely/wkb.py
@@ -49,6 +50,7 @@ tests/__init__.py
 tests/attribute-chains.txt
 tests/binascii_hex.txt
 tests/invalid_intersection.txt
+tests/polygonize.txt
 tests/rungrind.dist
 tests/test_doctests.py
 tests/test_threads.py

{Shapely-1.0.4 → Shapely-1.0.5}/manual/manual.txt

@@ -4,16 +4,15 @@ The Shapely Manual
 
 :Author: Sean Gillies
 :address: sgillies@frii.com
-    http://zcologia.com/sgillies
-
-:revision: 1.0
-:date: 2 January 2008
-
-:copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__.
+:revision: 1.0.5
+:date: 20 May 2008
+:copyright: This work is licensed under a `Creative Commons Attribution 3.0
+  United States License`__.
 
 .. __: http://creativecommons.org/licenses/by/3.0/us/
 
-:abstract: This document describes the Shapely Python package for programming with geospatial geometries.
+:abstract: This document describes the Shapely Python package for programming
+  with geospatial geometries.
 
 .. sectnum::
 
@@ -342,6 +341,32 @@ not:
   <shapely.geometry.polygon.Polygon object at ...>
 
 
+Other Operations
+----------------
+
+Polygonization
+++++++++++++++
+
+shapely.ops.polygonize(lines) : iterator
+  Returns an iterator over polygons constructed from the *lines* iterator. The
+  elements of *lines* may be Shapely geometries, objects that provide the geo
+  interface, or Numpy arrays or Python sequences shaped like LineStrings.
+
+.. code-block:: python
+
+  >>> from shapely.ops import polygonize
+  >>> lines = [
+  ...     ((0, 0), (1, 1)),
+  ...     ((0, 0), (0, 1)),
+  ...     ((0, 1), (1, 1)),
+  ...     ((1, 1), (1, 0)),
+  ...     ((1, 0), (0, 0))
+  ...     ]
+  >>> result = polygonize(lines)
+  >>> list(result.geoms)
+  [<shapely.geometry.polygon.Polygon object at ...>, <shapely.geometry.polygon.Polygon object at ...>]
+
+
 Unary Spatial Predicates
 ------------------------
 
@@ -798,6 +823,9 @@ Or a simple placemark-type object:
   >>> list(shape.coords)
   [(0.0, 0.0)]
 
+If you want to copy coordinate data to a new geometry, use the
+*shapely.geometry.shape* function instead.
+
 .. _Python geo interface: http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface
 
 

{Shapely-1.0.4 → Shapely-1.0.5}/setup.py

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

{Shapely-1.0.4 → Shapely-1.0.5}/setup_windows.py

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

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/geometry/__init__.py

@@ -6,4 +6,3 @@ from multipoint import MultiPoint, asMultiPoint
 from multilinestring import MultiLineString, asMultiLineString
 from multipolygon import MultiPolygon, asMultiPolygon
 from collection import GeometryCollection
-

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/geometry/base.py

@@ -207,11 +207,29 @@ class GeometrySequence(object):
                 max = l
 
 
+class HeterogeneousGeometrySequence(GeometrySequence):
+
+    def __init__(self, parent):
+        self.__p__ = parent
+        self._geom = parent._geom
+        self._ndim = parent._ndim
+
+    def next(self):
+        if self._index < self.__len__():
+            sub = lgeos.GEOSGetGeometryN(self._geom, self._index)
+            g = geom_factory(sub)
+            g._owned = True
+            self._index += 1
+            return g
+        else:
+            raise StopIteration 
+    
+
 def exceptNull(func):
     """Decorator which helps avoid GEOS operations on null pointers."""
     def wrapper(*args, **kwargs):
         # self is the first arg
-        if args[0]._geom is None:
+        if not args[0]._geom:
             raise ValueError, "Null geometry supports no operations"
         return func(*args, **kwargs)
     return wrapper
@@ -220,7 +238,7 @@ def exceptEitherNull(func):
     """Decorator which avoids GEOS operations on one or more null pointers."""
     def wrapper(*args, **kwargs):
         # self is the first arg
-        if args[0]._geom is None or args[1]._geom is None:
+        if not args[0]._geom or not args[1]._geom:
             raise ValueError, "Null geometry supports no operations"
         return func(*args, **kwargs)
     return wrapper
@@ -459,3 +477,29 @@ class BaseGeometry(object):
         
         return (minx, miny, maxx, maxy)
 
+
+class BaseMultiPartGeometry(BaseGeometry):
+
+    @property
+    def ctypes(self):
+        raise NotImplementedError, \
+        "Multi-part geometries have no ctypes representations"
+
+    @property
+    def __array_interface__(self):
+        """Provide the Numpy array protocol."""
+        raise NotImplementedError, \
+        "Multi-part geometries do not themselves provide the array interface"
+
+    def _get_coords(self):
+        raise NotImplementedError, \
+        "Sub-geometries may have coordinate sequences, but collections do not"
+
+    def _set_coords(self, ob):
+        raise NotImplementedError, \
+        "Sub-geometries may have coordinate sequences, but collections do not"
+
+    @property
+    def coords(self):
+        raise NotImplementedError, \
+        "Multi-part geometries do not provide a coordinate sequence"

Shapely-1.0.5/shapely/geometry/collection.py

@@ -0,0 +1,38 @@
+"""
+Geometry collections.
+"""
+
+from shapely.geometry.base import BaseMultiPartGeometry
+from shapely.geometry.base import HeterogeneousGeometrySequence, exceptNull
+
+
+class GeometryCollection(BaseMultiPartGeometry):
+
+    """A geometry collection.
+    """
+
+    def __init__(self):
+        BaseMultiPartGeometry.__init__(self)
+
+    @property
+    def __geo_interface__(self):
+        geometries = []
+        for geom in self.geoms:
+            geometries.append(geom.__geo_interface__)
+        return dict(type='GeometryCollection', geometries=geometries)
+
+    @property
+    @exceptNull
+    def geoms(self):
+        return HeterogeneousGeometrySequence(self)
+
+
+# Test runner
+def _test():
+    import doctest
+    doctest.testmod()
+
+
+if __name__ == "__main__":
+    _test()
+

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/geometry/geo.py

@@ -43,7 +43,10 @@ def asShape(context):
     else:
         ob = context
 
-    geom_type = ob.get("type").lower()
+    try:
+        geom_type = ob.get("type").lower()
+    except AttributeError:
+        raise ValueError, "Context does not provide geo interface"
 
     if geom_type == "point":
         return asPoint(ob["coordinates"])

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/geometry/linestring.py

@@ -16,8 +16,12 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         array = ob.__array_interface__
         assert len(array['shape']) == 2
         m = array['shape'][0]
-        n = array['shape'][1]
-        assert m >= 2
+        if m < 2:
+            raise ValueError, "LineStrings must have at least 2 coordinate tuples"
+        try:
+            n = array['shape'][1]
+        except IndexError:
+            raise ValueError, "Input %s is the wrong shape for a LineString" % str(ob)
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
@@ -42,8 +46,11 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
             dy = c_double(cp[n*i+1])
             dz = None
             if n == 3:
-                dz = c_double(cp[n*i+2])
-        
+                try:
+                    dz = c_double(cp[n*i+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)
@@ -54,8 +61,12 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
     except AttributeError:
         # Fall back on list
         m = len(ob)
-        n = len(ob[0])
-        assert m >= 2
+        if m < 2:
+            raise ValueError, "LineStrings must have at least 2 coordinate tuples"
+        try:
+            n = len(ob[0])
+        except TypeError:
+            raise ValueError, "Input %s is the wrong shape for a LineString" % str(ob)
         assert n == 2 or n == 3
 
         # Create a coordinate sequence
@@ -75,7 +86,10 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
             dy = c_double(coords[1])
             dz = None
             if n == 3:
-                dz = c_double(coords[2])
+                try:
+                    dz = c_double(coords[2])
+                except IndexError:
+                    raise ValueError, "Inconsistent coordinate dimensionality"
         
             # Because of a bug in the GEOS C API, 
             # always set X before Y

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/geometry/polygon.py

@@ -17,7 +17,8 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         assert len(array['shape']) == 2
         m = array['shape'][0]
         n = array['shape'][1]
-        assert m >= 2
+        if m < 3:
+            raise ValueError, "A LinearRing must have at least 3 coordinate tuples"
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
@@ -76,7 +77,8 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         # Fall back on list
         m = len(ob)
         n = len(ob[0])
-        assert m >= 2
+        if m < 3:
+            raise ValueError, "A LinearRing must have at least 3 coordinate tuples"
         assert (n == 2 or n == 3)
 
         # Add closing coordinates if not provided

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/iterops.py

@@ -1,4 +1,5 @@
 """
+Iterative forms of operations.
 """
 
 from ctypes import c_char_p, c_size_t
@@ -36,7 +37,7 @@ class BinaryPredicateIterator(object):
             except TypeError:
                 this_geom = item
                 ob = this_geom
-            if this_geom._geom is None:
+            if not this_geom._geom:
                 raise ValueError, "Null geometry supports no operations"
             retval = self.fn(geom._geom, this_geom._geom)
             if retval == 2:
@@ -53,4 +54,3 @@ within = BinaryPredicateIterator(lgeos.GEOSWithin)
 contains = BinaryPredicateIterator(lgeos.GEOSContains)
 overlaps = BinaryPredicateIterator(lgeos.GEOSOverlaps)
 equals = BinaryPredicateIterator(lgeos.GEOSEquals)
-

Shapely-1.0.5/shapely/ops.py

@@ -0,0 +1,29 @@
+from shapely.geos import lgeos
+from shapely.geometry.base import geom_factory, BaseGeometry
+from shapely.geometry import asShape, asLineString
+from ctypes import byref, c_void_p
+
+def shapeup(ob):
+    if isinstance(ob, BaseGeometry):
+        return ob
+    else:
+        try:
+            return asShape(ob)
+        except ValueError:
+            return asLineString(ob)
+
+def polygonize(iterator):
+    """Creates polygons from a list of LineString objects.
+    """
+    lines = [shapeup(ob) for ob in iterator]
+    geom_array_type = c_void_p * len(lines)
+    geom_array = geom_array_type()
+    for i, line in enumerate(lines):
+        geom_array[i] = line._geom
+    product = lgeos.GEOSPolygonize(byref(geom_array), len(lines))
+    collection = geom_factory(product)
+    for g in collection.geoms:
+        clone = lgeos.GEOSGeom_clone(g._geom)
+        g = geom_factory(clone)
+        g._owned = False
+        yield g

{Shapely-1.0.4 → Shapely-1.0.5}/shapely/predicates.py

@@ -27,7 +27,7 @@ class BinaryPredicate(object):
         return self
 
     def __call__(self, other):
-        if self.context._geom is None or other._geom is None:
+        if not self.context._geom or not other._geom:
             raise ValueError, "Null geometry supports no operations"
         return bool(self.fn(self.context._geom, other._geom))
 
@@ -49,7 +49,7 @@ class UnaryPredicate(object):
         self.fn.errcheck = errcheck
 
     def __get__(self, obj, objtype=None):
-        if obj._geom is None:
+        if not obj._geom:
             raise ValueError, "Null geometry supports no operations"
         return bool(self.fn(obj._geom))
     

{Shapely-1.0.4 → Shapely-1.0.5}/tests/Polygon.txt

@@ -139,4 +139,10 @@ Check that we can set coordinates of a null geometry
   >>> print r_null.length # doctest: +ELLIPSIS
   3.414...
 
+Error handling
+--------------
 
+  >>> p = Polygon([[1,2], [2, 3]])
+  Traceback (most recent call last):
+  ...
+  ValueError: A LinearRing must have at least 3 coordinate tuples

Shapely-1.0.5/tests/polygonize.txt

@@ -0,0 +1,29 @@
+Polygonizing
+============
+
+    >>> from shapely.geometry import LineString, Point
+    >>> from shapely.ops import polygonize
+    >>> lines = [
+    ...     LineString(((0, 0), (1, 1))),
+    ...     LineString(((0, 0), (0, 1))),
+    ...     LineString(((0, 1), (1, 1))),
+    ...     LineString(((1, 1), (1, 0))),
+    ...     LineString(((1, 0), (0, 0))),
+    ...     LineString(((5, 5), (6, 6))),
+    ...     Point(0, 0),
+    ...     ]
+    >>> result = polygonize(lines)
+    >>> list(result)
+    [<shapely.geometry.polygon.Polygon object at ...>, <shapely.geometry.polygon.Polygon object at ...>]
+
+    >>> lines2 = [
+    ...     ((0, 0), (1, 1)),
+    ...     ((0, 0), (0, 1)),
+    ...     ((0, 1), (1, 1)),
+    ...     ((1, 1), (1, 0)),
+    ...     ((1, 0), (0, 0)),
+    ...     ((5, 5), (6, 6)),
+    ...     ]
+    >>> result2 = polygonize(lines2)
+    >>> list(result2)
+    [<shapely.geometry.polygon.Polygon object at ...>, <shapely.geometry.polygon.Polygon object at ...>]

Shapely-1.0.4/shapely/geometry/collection.py

@@ -1,24 +0,0 @@
-"""
-Geometry collections.
-"""
-
-from shapely.geometry.base import BaseGeometry
-
-class GeometryCollection(BaseGeometry):
-
-    """A geometry collection.
-    """
-
-    def __init__(self):
-        BaseGeometry.__init__(self)
-
-
-# Test runner
-def _test():
-    import doctest
-    doctest.testmod()
-
-
-if __name__ == "__main__":
-    _test()
-