shapely 1.0b3__tar.gz → 1.0b4__tar.gz

{Shapely-1.0b3 → Shapely-1.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0b3
+Version: 1.0b4
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -23,7 +23,7 @@ Description: Shapely
         Dependencies
         ------------
         
-        * libgeos_c (2.2.3, also reported to work with 3.0)
+        * libgeos_c (2.2.3 or 3.0.0+)
         * Python ctypes_ (standard in Python 2.5+)
         
         .. _ctypes: http://pypi.python.org/pypi/ctypes/

{Shapely-1.0b3 → Shapely-1.0b4}/README.txt

@@ -15,7 +15,7 @@ http://zcologia.com/news/564/shapely-for-python-3-0/.)
 Dependencies
 ------------
 
-* libgeos_c (2.2.3, also reported to work with 3.0)
+* libgeos_c (2.2.3 or 3.0.0+)
 * Python ctypes_ (standard in Python 2.5+)
 
 .. _ctypes: http://pypi.python.org/pypi/ctypes/

{Shapely-1.0b3 → Shapely-1.0b4}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0b3
+Version: 1.0b4
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -23,7 +23,7 @@ Description: Shapely
         Dependencies
         ------------
         
-        * libgeos_c (2.2.3, also reported to work with 3.0)
+        * libgeos_c (2.2.3 or 3.0.0+)
         * Python ctypes_ (standard in Python 2.5+)
         
         .. _ctypes: http://pypi.python.org/pypi/ctypes/

{Shapely-1.0b3 → Shapely-1.0b4}/manual/manual.txt

@@ -9,9 +9,9 @@ The Shapely Manual
 :revision: 1.0
 :date: 2 January 2008
 
-:copyright: This work is licensed under a `Creative Commons Attribution-Share Alike 3.0 United States License`__.
+:copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__.
 
-.. __: http://creativecommons.org/licenses/by-sa/3.0/us/
+.. __: http://creativecommons.org/licenses/by/3.0/us/
 
 :abstract: This document describes the Shapely Python package for programming with geospatial geometries.
 
@@ -19,6 +19,7 @@ The Shapely Manual
 
 .. contents::
 
+
 Background
 ==========
 
@@ -33,6 +34,7 @@ Package Index record_.
 .. _record: http://pypi.python.org/pypi/Shapely
 .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
 
+
 Geometries
 ==========
 
@@ -44,6 +46,7 @@ collections, and heterogeneous geometry collections. See the JTS illustration_.
 
 Shapely 1.0 does not provide circles, arcs, splines or the like.
 
+
 Factories
 ---------
 
@@ -111,6 +114,7 @@ Rings *must* be non-crossing, ordered coordinate sequences. The order may be
 clockwise or counter-clockwise. The resulting topology is independent of the
 order.
 
+
 Multipart Geometry Factories
 ----------------------------
 
@@ -156,6 +160,31 @@ holes) makes usage more clear
   >>> holes = [(b1, ..., bN), ...]
   >>> lines = MultiPolygon([(shell, holes), ...])
 
+
+Null Geometries
+---------------
+
+Null geometries can be created by calling the factories with no arguments, but
+almost nothing can be done with a null geometry.
+
+.. code-block:: python
+
+  >>> line_null = LineString()
+  >>> line_null.length
+  Traceback (most recent call last):
+  ...
+  ValueError: Null geometry supports no operations
+
+The coordinates of a null geometry *can* be set (see Section 3), after which
+the geometry is no longer null.
+
+.. code-block:: python
+
+  >>> l_null.coords = [(0, 0), (1, 1)]
+  >>> print l_null.length
+  1.414...
+
+
 Constructive Spatial Analysis Methods
 -------------------------------------
 
@@ -232,7 +261,6 @@ Centroid
   >>> centroid_point.wkt
   'POINT (-0.0000000000000000 -0.0000000000000000)'
 
-
 Convex Hull
 +++++++++++
 
@@ -264,6 +292,17 @@ Difference
   >>> polygon.difference(hull)
   <shapely.geometry.polygon.Polygon object at ...>
 
+Envelope
+++++++++
+
+.envelope : geometry
+  Returns the geometry's rectangular polygon envelope.
+
+.. code-block:: python
+
+  >>> polygon.envelope
+  <shapely.geometry.polygon.Polygon object at ...>
+
 Intersection
 ++++++++++++
 
@@ -302,6 +341,7 @@ not:
   >>> hull.union(polygon)
   <shapely.geometry.polygon.Polygon object at ...>
 
+
 Unary Spatial Predicates
 ------------------------
 
@@ -350,9 +390,10 @@ Examples
   >>> polygon.boundary.is_ring
   True
   >>> polygon.has_z
-  True
+  False
+
+(Note: that last return value exposes a bug in GEOS 2.2.3.)
 
-(Note: that last return value exposes a bug in GEOS 2.2.3. Should be False.)
 
 Binary Spatial Predicates
 -------------------------
@@ -437,6 +478,7 @@ Within
 .within(other): bool
   The inverse of *contains*.
 
+
 General Methods
 ---------------
 
@@ -462,6 +504,12 @@ Area
   Area of the geometry, unitless. Non-zero only for surfaces (polygons,
   multi-polygons).
 
+Bounds
+++++++
+
+.bounds : tuple
+  The geometry's (minx, miny, maxx, maxy) bounding box.
+
 Length
 ++++++
 
@@ -476,6 +524,8 @@ Examples
 
   >>> polygon.area
   4.0
+  >>> polygon.bounds
+  (-1.0, -1.0, 1.0, 1.0)
   >>> polygon.length
   8.0
   >>> line_r.length
@@ -483,6 +533,7 @@ Examples
   >>> line_b.length
   3.9812058474788765
 
+
 Geometry Parts and Coordinates
 ==============================
 
@@ -523,6 +574,7 @@ For line strings:
   >>> list(line_new.coords)
   [(1.0, 1.0), (2.0, 2.0)]
 
+
 Polygon Rings
 -------------
 
@@ -539,6 +591,7 @@ attribute of the geometry object.
 The interior boundaries (or holes) of a polygon can be accessed through the
 *interiors* attribute, which is a list of rings.
 
+
 Sub-geometries
 --------------
 
@@ -560,6 +613,22 @@ attribute of the geometry object, which is an iterator over the sub-geometries:
 The coordinate sequences of these sub-geometries can then be accessed as
 described above.
 
+
+Point Coordinates
+-----------------
+
+For the sake of convenience the coordinate values of points can be accessed
+read-only via **x**, **y**, and **z** attributes:
+
+.. code-block:: python
+
+  >>> point = Point(1.0, 1.0)
+  >>> point.x
+  1.0
+  >>> point.y
+  1.0
+
+
 Interoperation
 ==============
 
@@ -613,6 +682,7 @@ attribute. New geometries can be created from WKB data using the
   >>> loads(feature.GetGeometryRef().ExportToWkb())
   <shapely.geometry.polygon.Polygon object at ...>
 
+
 Python Sequences
 ----------------
 
@@ -652,6 +722,7 @@ used like
   >>> len(pa.interiors[0].coords)
   5
 
+
 Numpy Array Interface
 ---------------------
 
@@ -695,6 +766,7 @@ and a N x 2 array can be adapted to a line string
 
 There is no Numpy array representation of a polygon.
 
+
 Python Geo Interface
 --------------------
 
@@ -728,6 +800,7 @@ Or a simple placemark-type object:
 
 .. _Python geo interface: http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface
 
+
 Advanced Features
 =================
 
@@ -763,6 +836,7 @@ will be ultimately yielded from *iterops.contains*.
   >>> list(iterops.contains(polygon, iter((p, p.wkt) for p in points)))
   ['POINT (0.5000000000000000 0.5000000000000000)']
 
+
 Credits
 =======
 

{Shapely-1.0b3 → Shapely-1.0b4}/setup.py

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

{Shapely-1.0b3 → Shapely-1.0b4}/shapely/geometry/base.py

@@ -5,7 +5,7 @@ Base geometry class and utilities.
 from ctypes import string_at, byref, c_int, c_size_t, c_char_p, c_double
 import sys
 
-from shapely.geos import lgeos
+from shapely.geos import lgeos, free, allocated_c_char_p
 from shapely.predicates import BinaryPredicate, UnaryPredicate
 from shapely.topology import BinaryTopologicalOp, UnaryTopologicalOp
 
@@ -22,6 +22,8 @@ GEOMETRY_TYPES = [
     ]
 
 def geometry_type_name(g):
+    if g is None:
+        raise ValueError, "Null geometry has no type"
     return GEOMETRY_TYPES[lgeos.GEOSGeomTypeId(g)]
 
 # Abstract geometry factory for use with topological methods below
@@ -156,23 +158,42 @@ class GeometrySequence(object):
                 max = l
 
 
+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:
+            raise ValueError, "Null geometry supports no operations"
+        return func(*args, **kwargs)
+    return wrapper
+
+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:
+            raise ValueError, "Null geometry supports no operations"
+        return func(*args, **kwargs)
+    return wrapper
+
+
 class BaseGeometry(object):
     
     """Provides GEOS spatial predicates and topological operations.
     """
 
-    _geom = None
+    __geom = None # See _geom property below
     _ctypes_data = None
     _ndim = None
     _crs = None
     _owned = False
 
     def __init__(self):
-        self._geom = lgeos.GEOSGeomFromWKT(c_char_p('GEOMETRYCOLLECTION EMPTY'))
+        self.__geom = None
 
     def __del__(self):
-        if self._geom is not None and not self._owned:
-            lgeos.GEOSGeom_destroy(self._geom)
+        if self.__geom is not None and not self._owned:
+            lgeos.GEOSGeom_destroy(self.__geom)
 
     def __str__(self):
         return self.to_wkt()
@@ -189,11 +210,20 @@ class BaseGeometry(object):
         return (self.__class__, (), self.to_wkb())
 
     def __setstate__(self, state):
-        self._geom = lgeos.GEOSGeomFromWKB_buf(
+        self.__geom = lgeos.GEOSGeomFromWKB_buf(
                         c_char_p(state), 
                         c_size_t(len(state))
                         )
 
+    # _geom has been made a property with the GEOS geometry pointer stored
+    # in __geom so that geometries and geometry adapters can share __del__
+
+    def get_geom(self):
+        return self.__geom
+    def set_geom(self, val):
+        self.__geom = val
+    _geom = property(get_geom, set_geom)
+
     # Array and ctypes interfaces
 
     @property
@@ -222,6 +252,7 @@ class BaseGeometry(object):
         """Provide the Numpy array protocol."""
         raise NotImplementedError
 
+    @exceptNull
     def get_coords(self):
         return CoordinateSequence(self)
 
@@ -243,19 +274,34 @@ class BaseGeometry(object):
 
     # Type of geometry and its representations
 
+    @exceptNull
     def geometryType(self):
         """Returns a string representing the geometry type, e.g. 'Polygon'."""
         return geometry_type_name(self._geom)
 
+    @exceptNull
     def to_wkb(self):
         """Returns a WKB byte string representation of the geometry."""
+        func = lgeos.GEOSGeomToWKB_buf
         size = c_int()
-        bytes = lgeos.GEOSGeomToWKB_buf(self._geom, byref(size))
-        return string_at(bytes, size.value)
-
+        def errcheck(result, func, argtuple):
+            retval = string_at(result, size.value)[:]
+            free(result)
+            return retval
+        func.errcheck = errcheck
+        return func(self._geom, byref(size))
+
+    @exceptNull
     def to_wkt(self):
         """Returns a WKT string representation of the geometry."""
-        return string_at(lgeos.GEOSGeomToWKT(self._geom))
+        func = lgeos.GEOSGeomToWKT
+        def errcheck(result, func, argtuple):
+            retval = result.value
+            free(result)
+            return retval
+        func.restype = allocated_c_char_p
+        func.errcheck = errcheck
+        return lgeos.GEOSGeomToWKT(self._geom)
 
     geom_type = property(geometryType)
     wkt = property(to_wkt)
@@ -264,17 +310,20 @@ class BaseGeometry(object):
     # Basic geometry properties
 
     @property
+    @exceptNull
     def area(self):
         a = c_double()
         retval =  lgeos.GEOSArea(self._geom, byref(a))
         return a.value
 
     @property
+    @exceptNull
     def length(self):
         len = c_double()
         retval =  lgeos.GEOSLength(self._geom, byref(len))
         return len.value
 
+    @exceptEitherNull
     def distance(self, other):
         d = c_double()
         retval =  lgeos.GEOSDistance(self._geom, other._geom, byref(d))
@@ -295,15 +344,22 @@ class BaseGeometry(object):
     centroid = UnaryTopologicalOp(lgeos.GEOSGetCentroid, geom_factory)
 
     # Buffer has a unique distance argument, so not a descriptor
+    @exceptNull
     def buffer(self, distance, quadsegs=16):
         return geom_factory(
             lgeos.GEOSBuffer(self._geom, c_double(distance), c_int(quadsegs))
             )
 
     # Relate has a unique string return value
+    @exceptNull
     def relate(self, other):
         func = lgeos.GEOSRelate
-        func.restype = c_char_p
+        def errcheck(result, func, argtuple):
+            retval = result.value
+            free(result)
+            return retval
+        func.restype = allocated_c_char_p
+        func.errcheck = errcheck
         return lgeos.GEOSRelate(self._geom, other._geom)
 
     # Binary predicates
@@ -331,6 +387,7 @@ class BaseGeometry(object):
     has_z = UnaryPredicate(lgeos.GEOSHasZ)
 
     @property
+    @exceptNull
     def bounds(self):
         env = self.envelope
         if env.geom_type != 'Polygon':

{Shapely-1.0b3 → Shapely-1.0b4}/shapely/geometry/linestring.py

@@ -6,7 +6,7 @@ from ctypes import byref, c_double, c_int, cast, POINTER, pointer
 from ctypes import ArgumentError
 
 from shapely.geos import lgeos
-from shapely.geometry.base import BaseGeometry
+from shapely.geometry.base import BaseGeometry, exceptNull
 
 
 def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
@@ -86,7 +86,7 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
     if update_geom is not None:
         return None
     else:
-        return (lgeos.GEOSGeom_createLineString(cs), n)
+        return lgeos.GEOSGeom_createLineString(cs), n
 
 def update_linestring_from_py(geom, ob):
     geos_linestring_from_py(ob, geom._geom, geom._ndim)
@@ -118,7 +118,9 @@ class LineString(BaseGeometry):
         Each result in a line string from (0.0, 0.0) to (1.0, 2.0).
         """
         BaseGeometry.__init__(self)
+        self._init_geom(coordinates)
 
+    def _init_geom(self, coordinates):
         if coordinates is None:
             # allow creation of null lines, to support unpickling
             pass
@@ -133,6 +135,7 @@ class LineString(BaseGeometry):
             }
 
     @property
+    @exceptNull
     def ctypes(self):
         if not self._ctypes_data:
             cs = lgeos.GEOSGeom_getCoordSeq(self._geom)
@@ -164,6 +167,8 @@ class LineString(BaseGeometry):
     # Coordinate access
 
     def set_coords(self, coordinates):
+        if self._geom is None:
+            self._init_geom(coordinates)
         update_linestring_from_py(self, coordinates)
 
     coords = property(BaseGeometry.get_coords, set_coords)
@@ -176,14 +181,12 @@ class LineStringAdapter(LineString):
     """
     
     context = None
+    __geom = None
+    _owned = False
 
     def __init__(self, context):
         self.context = context
 
-    # Override base class __del__
-    def __del__(self):
-        pass
-
     @property
     def _ndim(self):
         try:
@@ -199,7 +202,10 @@ class LineStringAdapter(LineString):
     @property
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
-        return geos_linestring_from_py(self.context)[0]       
+        if self.__geom is not None:
+            lgeos.GEOSGeom_destroy(self.__geom)
+        self.__geom, n = geos_linestring_from_py(self.context)
+        return self.__geom
 
     @property
     def __array_interface__(self):

{Shapely-1.0b3 → Shapely-1.0b4}/shapely/geometry/multilinestring.py

@@ -5,7 +5,7 @@ Multi-part collection of linestrings.
 from ctypes import byref, c_double, c_int, c_void_p, cast, POINTER, pointer
 
 from shapely.geos import lgeos
-from shapely.geometry.base import BaseGeometry, GeometrySequence
+from shapely.geometry.base import BaseGeometry, GeometrySequence, exceptNull
 from shapely.geometry.linestring import LineString, geos_linestring_from_py
 
 
@@ -102,6 +102,7 @@ class MultiLineString(BaseGeometry):
         "Multi-part geometries do not provide a coordinate sequence"
 
     @property
+    @exceptNull
     def geoms(self):
         return GeometrySequence(self, LineString)
 
@@ -113,14 +114,12 @@ class MultiLineStringAdapter(MultiLineString):
     """
     
     context = None
+    __geom = None
+    _owned = False
 
     def __init__(self, context):
         self.context = context
 
-    # Override base class __del__
-    def __del__(self):
-        pass
-
     @property
     def _ndim(self):
         try:
@@ -136,7 +135,10 @@ class MultiLineStringAdapter(MultiLineString):
     @property
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
-        return geos_multilinestring_from_py(self.context)[0]       
+        if self.__geom is not None:
+            lgeos.GEOSGeom_destroy(self.__geom)
+        self.__geom = geos_multilinestring_from_py(self.context)[0]
+        return self.__geom
 
 
 def asMultiLineString(context):

{Shapely-1.0b3 → Shapely-1.0b4}/shapely/geometry/multipoint.py

@@ -5,7 +5,7 @@ Multiple points.
 from ctypes import byref, c_double, c_int, c_void_p, cast, POINTER, pointer
 
 from shapely.geos import lgeos
-from shapely.geometry.base import BaseGeometry, GeometrySequence
+from shapely.geometry.base import BaseGeometry, GeometrySequence, exceptNull
 from shapely.geometry.point import Point, geos_point_from_py
 
 
@@ -44,7 +44,7 @@ def geos_multipoint_from_py(ob):
             geom, ndims = geos_point_from_py(coords)
             subs[i] = cast(geom, c_void_p)
             
-    return (lgeos.GEOSGeom_createCollection(4, subs, m), n)
+    return lgeos.GEOSGeom_createCollection(4, subs, m), n
 
 
 class MultiPoint(BaseGeometry):
@@ -81,6 +81,7 @@ class MultiPoint(BaseGeometry):
 
 
     @property
+    @exceptNull
     def __geo_interface__(self):
         return {
             'type': 'MultiPoint',
@@ -88,6 +89,7 @@ class MultiPoint(BaseGeometry):
             }
 
     @property
+    @exceptNull
     def ctypes(self):
         if not self._ctypes_data:
             temp = c_double()
@@ -108,6 +110,7 @@ class MultiPoint(BaseGeometry):
             self._ctypes_data = data
         return self._ctypes_data
 
+    @exceptNull
     def array_interface(self):
         """Provide the Numpy array protocol."""
         ai = self.array_interface_base
@@ -121,6 +124,7 @@ class MultiPoint(BaseGeometry):
         "Multipart geometries do not themselves provide coordinate sequences"
 
     @property
+    @exceptNull
     def geoms(self):
         return GeometrySequence(self, Point)
         
@@ -132,14 +136,12 @@ class MultiPointAdapter(MultiPoint):
     """
     
     context = None
+    __geom = None
+    _owned = False
 
     def __init__(self, context):
         self.context = context
 
-    # Override base class __del__
-    def __del__(self):
-        pass
-
     @property
     def _ndim(self):
         try:
@@ -155,7 +157,10 @@ class MultiPointAdapter(MultiPoint):
     @property
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
-        return geos_multipoint_from_py(self.context)[0]       
+        if self.__geom is not None:
+            lgeos.GEOSGeom_destroy(self.__geom)
+        self.__geom, n = geos_multipoint_from_py(self.context)
+        return self.__geom
 
     @property
     def __array_interface__(self):