shapely 1.2b6__tar.gz → 1.2rc1__tar.gz

{Shapely-1.2b6 → Shapely-1.2rc1}/CHANGES.txt

@@ -1,5 +1,9 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.2b7 (2010-04-22)
+------------------
+- Memory leak associated with new empty geometry state fixed.
+
 1.2b6 (2010-04-13)
 ------------------
 - Broken GeometryCollection fixed.

Shapely-1.2rc1/CREDITS.txt

@@ -0,0 +1,24 @@
+Shapely is written by:
+
+* Sean Gillies
+* Aron Bierbaum
+* Kai Lautaportti
+
+Patches contributed by:
+
+* Howard Butler
+* Fr |eaigue| d |eaigue| ric Junod
+* Eric Lemoine
+* Jonathan Tartley
+* Kristian Thy
+* Oliver Tonnhofer
+
+Additional help from:
+
+* Justin Bronn (GeoDjango) for ctypes inspiration
+* Martin Davis (JTS)
+* Jaakko Salli for the Windows distributions
+* Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
+
+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).

{Shapely-1.2b6 → Shapely-1.2rc1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b6
+Version: 1.2rc1
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: 
+Description: =======
         Shapely
         =======
         
@@ -15,9 +15,9 @@ Description:
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometries. It is not concerned with data formats or coordinate
-        systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-        JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
+        planar geometries. It is not concerned with data formats or coordinate systems.
+        It is based on the widely deployed GEOS_ (the engine of PostGIS_) and JTS_
+        (from which GEOS is ported) libraries. This C dependency is traded for the
         ability to analyze geometries with blazing speed.
         
         In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
@@ -27,7 +27,6 @@ Description:
         * Shapely manual_
         * Shapely `example apps`_
         
-        
         Dependencies
         ------------
         
@@ -36,7 +35,6 @@ Description:
         * Python >=2.5,<3
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
-        
         Installation
         ------------
         
@@ -50,7 +48,6 @@ Description:
         
         $ python setup.py install
         
-        
         Usage
         -----
         
@@ -67,12 +64,19 @@ Description:
         See the manual_ for comprehensive usage snippets and the dissolve.py and
         intersect.py `example apps`_.
         
+        Integration
+        -----------
+        
+        Shapely does not read or write data files, but it can serialize and deserialize
+        using several well known formats and protocols. The shapely.wkb and shapely.wkt
+        modules provide dumpers and loaders inspired by Python's pickle module.::
         
-        Numpy integration
-        -----------------
+        >>> from shapely.wkt import dumps, loads
+        >>> dumps(loads('POINT (0 0)'))
+        'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear geometries, such as the rings of a polygon, provide the Numpy array
-        interface::
+        All linear geometries, such as the rings of a polygon (like ``patch`` above),
+        provide the Numpy array interface.::
         
         >>> from numpy import asarray
         >>> ag = asarray(patch.exterior)
@@ -83,9 +87,9 @@ Description:
         ...
         [  1.00000000e+01,   0.00000000e+00]])
         
-        That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-        for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-        property for getting separate arrays of coordinate x and y values::
+        That yields a numpy array of [x, y] arrays. This is not always exactly what one
+        wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
+        property for getting separate arrays of coordinate x and y values.::
         
         >>> x, y = patch.exterior.xy
         >>> ax = asarray(x)
@@ -100,15 +104,14 @@ Description:
         >>> asLineString(ag).wkt
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
-        
         Testing
         -------
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+        Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+        setup.py.::
         
         $ python setup.py test
         
-        
         Support
         -------
         
@@ -118,7 +121,6 @@ Description:
         
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
-        
         Credits
         -------
         
@@ -141,18 +143,18 @@ Description:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)
+        * Jaakko Salli for the Windows distributions
         * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
         
         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).
         
-        
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
         .. _GEOS: http://trac.osgeo.org/geos/
         .. _example apps: http://trac.gispython.org/lab/wiki/Examples
         .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/manual.html
+        .. _manual: http://gispython.org/shapely/docs/1.2
         .. |eaigue| unicode:: U+00E9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b6 → Shapely-1.2rc1}/README.txt

@@ -1,4 +1,4 @@
-
+=======
 Shapely
 =======
 
@@ -7,9 +7,9 @@ Shapely
    :height: 400
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
-planar geometries. It is not concerned with data formats or coordinate
-systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
+planar geometries. It is not concerned with data formats or coordinate systems.
+It is based on the widely deployed GEOS_ (the engine of PostGIS_) and JTS_
+(from which GEOS is ported) libraries. This C dependency is traded for the
 ability to analyze geometries with blazing speed.
 
 In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
@@ -19,7 +19,6 @@ database using idiomatic Python. For more details, see:
 * Shapely manual_
 * Shapely `example apps`_
 
-
 Dependencies
 ------------
 
@@ -28,7 +27,6 @@ Shapely 1.2 depends on:
 * Python >=2.5,<3
 * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
 
-
 Installation
 ------------
 
@@ -42,7 +40,6 @@ or from a source distribution with the setup script::
 
   $ python setup.py install
 
-
 Usage
 -----
 
@@ -59,12 +56,19 @@ buffering a point::
 See the manual_ for comprehensive usage snippets and the dissolve.py and
 intersect.py `example apps`_.
 
+Integration 
+-----------
 
-Numpy integration
------------------
+Shapely does not read or write data files, but it can serialize and deserialize
+using several well known formats and protocols. The shapely.wkb and shapely.wkt
+modules provide dumpers and loaders inspired by Python's pickle module.::
 
-All linear geometries, such as the rings of a polygon, provide the Numpy array
-interface::
+  >>> from shapely.wkt import dumps, loads
+  >>> dumps(loads('POINT (0 0)'))
+  'POINT (0.0000000000000000 0.0000000000000000)'
+
+All linear geometries, such as the rings of a polygon (like ``patch`` above),
+provide the Numpy array interface.::
 
   >>> from numpy import asarray
   >>> ag = asarray(patch.exterior)
@@ -75,9 +79,9 @@ interface::
          ...
          [  1.00000000e+01,   0.00000000e+00]])
 
-That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-property for getting separate arrays of coordinate x and y values::
+That yields a numpy array of [x, y] arrays. This is not always exactly what one
+wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
+property for getting separate arrays of coordinate x and y values.::
 
   >>> x, y = patch.exterior.xy
   >>> ax = asarray(x)
@@ -92,15 +96,14 @@ Numpy arrays can also be adapted to Shapely linestrings::
   >>> asLineString(ag).wkt
   'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
 
-
 Testing
 -------
 
-Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+setup.py.::
 
   $ python setup.py test
 
-
 Support
 -------
 
@@ -110,7 +113,6 @@ If you have questions, please consider joining our community list:
 
 http://trac.gispython.org/projects/PCL/wiki/CommunityList
 
-
 Credits
 -------
 
@@ -133,18 +135,18 @@ Additional help from:
 
 * Justin Bronn (GeoDjango) for ctypes inspiration
 * Martin Davis (JTS)
+* Jaakko Salli for the Windows distributions
 * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
 
 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).
 
-
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.org
 .. _GEOS: http://trac.osgeo.org/geos/
 .. _example apps: http://trac.gispython.org/lab/wiki/Examples
 .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-.. _manual: http://gispython.org/shapely/manual.html
+.. _manual: http://gispython.org/shapely/docs/1.2
 .. |eaigue| unicode:: U+00E9
    :trim:
 .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b6 → Shapely-1.2rc1}/Shapely.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b6
+Version: 1.2rc1
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: 
+Description: =======
         Shapely
         =======
         
@@ -15,9 +15,9 @@ Description:
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometries. It is not concerned with data formats or coordinate
-        systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-        JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
+        planar geometries. It is not concerned with data formats or coordinate systems.
+        It is based on the widely deployed GEOS_ (the engine of PostGIS_) and JTS_
+        (from which GEOS is ported) libraries. This C dependency is traded for the
         ability to analyze geometries with blazing speed.
         
         In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
@@ -27,7 +27,6 @@ Description:
         * Shapely manual_
         * Shapely `example apps`_
         
-        
         Dependencies
         ------------
         
@@ -36,7 +35,6 @@ Description:
         * Python >=2.5,<3
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
-        
         Installation
         ------------
         
@@ -50,7 +48,6 @@ Description:
         
         $ python setup.py install
         
-        
         Usage
         -----
         
@@ -67,12 +64,19 @@ Description:
         See the manual_ for comprehensive usage snippets and the dissolve.py and
         intersect.py `example apps`_.
         
+        Integration
+        -----------
+        
+        Shapely does not read or write data files, but it can serialize and deserialize
+        using several well known formats and protocols. The shapely.wkb and shapely.wkt
+        modules provide dumpers and loaders inspired by Python's pickle module.::
         
-        Numpy integration
-        -----------------
+        >>> from shapely.wkt import dumps, loads
+        >>> dumps(loads('POINT (0 0)'))
+        'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear geometries, such as the rings of a polygon, provide the Numpy array
-        interface::
+        All linear geometries, such as the rings of a polygon (like ``patch`` above),
+        provide the Numpy array interface.::
         
         >>> from numpy import asarray
         >>> ag = asarray(patch.exterior)
@@ -83,9 +87,9 @@ Description:
         ...
         [  1.00000000e+01,   0.00000000e+00]])
         
-        That yields a numpy array of [x, y] arrays. This is not exactly what one wants
-        for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
-        property for getting separate arrays of coordinate x and y values::
+        That yields a numpy array of [x, y] arrays. This is not always exactly what one
+        wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` geometry
+        property for getting separate arrays of coordinate x and y values.::
         
         >>> x, y = patch.exterior.xy
         >>> ax = asarray(x)
@@ -100,15 +104,14 @@ Description:
         >>> asLineString(ag).wkt
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
-        
         Testing
         -------
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised like::
+        Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+        setup.py.::
         
         $ python setup.py test
         
-        
         Support
         -------
         
@@ -118,7 +121,6 @@ Description:
         
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
-        
         Credits
         -------
         
@@ -141,18 +143,18 @@ Description:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)
+        * Jaakko Salli for the Windows distributions
         * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
         
         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).
         
-        
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
         .. _GEOS: http://trac.osgeo.org/geos/
         .. _example apps: http://trac.gispython.org/lab/wiki/Examples
         .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/manual.html
+        .. _manual: http://gispython.org/shapely/docs/1.2
         .. |eaigue| unicode:: U+00E9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2b6 → Shapely-1.2rc1}/setup.py

@@ -16,7 +16,7 @@ readme_text = file('README.txt', 'rb').read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2b6',
+    version             = '1.2rc1',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Planar geometries, predicates, and operations',

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geometry/base.py

@@ -3,6 +3,7 @@
 
 from functools import wraps
 import sys
+import warnings
 
 from shapely.coords import CoordinateSequence
 from shapely.geos import lgeos
@@ -53,6 +54,7 @@ def exceptNull(func):
         return func(*args, **kwargs)
     return wrapper
 
+EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
 
 class BaseGeometry(object):
     """
@@ -78,7 +80,7 @@ class BaseGeometry(object):
     # _owned : bool
     #     True if this object's GEOS geometry is owned by another as in the case
     #     of a multipart geometry member.
-    __geom__ = None
+    __geom__ = EMPTY
     __p__ = None
     _ctypes_data = None
     _ndim = None
@@ -88,13 +90,18 @@ class BaseGeometry(object):
     # Backend config
     impl = DefaultImplementation
 
-    def __init__(self):
-        self.__geom__ = wkb.deserialize('010700000000000000'.decode('hex'))
+    @property
+    def _is_empty(self):
+        return self.__geom__ in [EMPTY, None]
 
-    def __del__(self):
-        if self.__geom__ is not None and not self._owned:
+    def empty(self):
+        if not (self._owned or self._is_empty):
             from shapely.geos import lgeos
             lgeos.GEOSGeom_destroy(self.__geom__)
+        self.__geom__ = EMPTY
+
+    def __del__(self):
+        self.empty()
         self.__geom__ = None
         self.__p__ = None
 
@@ -106,12 +113,14 @@ class BaseGeometry(object):
         return (self.__class__, (), self.to_wkb())
 
     def __setstate__(self, state):
+        self.empty()
         self.__geom__ = wkb.deserialize(state)
     
     # The _geom property
     def _get_geom(self):
         return self.__geom__
     def _set_geom(self, val):
+        self.empty()
         self.__geom__ = val
     _geom = property(_get_geom, _set_geom)
 
@@ -252,13 +261,15 @@ class BaseGeometry(object):
         """A figure that envelopes the geometry"""
         return geom_factory(self.impl['envelope'](self))
 
-    def buffer(self, distance, quadsegs=16):
+    def buffer(self, distance, resolution=16, quadsegs=None):
         """Returns a geometry with an envelope at a distance from the object's 
         envelope
         
         A negative distance has a "shrink" effect. A zero distance may be used
         to "tidy" a polygon. The resolution of the buffer around each vertex of
-        the object increases by increasing the quadsegs parameter.
+        the object increases by increasing the resolution keyword parameter
+        or second positional parameter. Note: the use of a `quadsegs` parameter
+        is deprecated and will be gone from the next major release.
 
         Example:
 
@@ -271,7 +282,14 @@ class BaseGeometry(object):
           >>> g.buffer(1.0, 3).area     # triangle approximation
           3.0
         """
-        return geom_factory(self.impl['buffer'](self, distance, quadsegs))
+        if quadsegs is not None:
+            warnings.warn(
+                "The `quadsegs` argument is deprecated. Use `resolution`.", 
+                DeprecationWarning)
+            res = quadsegs
+        else:
+            res = resolution
+        return geom_factory(self.impl['buffer'](self, distance, res))
 
     def simplify(self, tolerance, preserve_topology=True):
         """Returns a simplified geometry produced by the Douglas-Puecker 
@@ -320,7 +338,7 @@ class BaseGeometry(object):
     @property
     def is_empty(self):
         """True if the set of points in this geometry is empty, else False"""
-        return bool(self.impl['is_empty'](self))
+        return bool(self.impl['is_empty'](self)) or (self._geom is None)
 
     @property
     def is_ring(self):

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geometry/linestring.py

@@ -37,14 +37,8 @@ class LineString(BaseGeometry):
           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
-        else:
-            self._geom, self._ndim = geos_linestring_from_py(coordinates)
+        if coordinates is not None:
+            self._set_coords(coordinates)
 
     @property
     def __geo_interface__(self):
@@ -66,14 +60,9 @@ class LineString(BaseGeometry):
     __array_interface__ = property(array_interface)
 
     # Coordinate access
-
     def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
-        update_linestring_from_py(self, coordinates)
+        self.empty()
+        self._geom, self._ndim = geos_linestring_from_py(coordinates)
 
     coords = property(BaseGeometry._get_coords, _set_coords)
 
@@ -94,9 +83,6 @@ class LineString(BaseGeometry):
 
 class LineStringAdapter(CachingGeometryProxy, LineString):
 
-    context = None
-    _owned = False
-
     def __init__(self, context):
         self.context = context
         self.factory = geos_linestring_from_py

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geometry/point.py

@@ -45,17 +45,8 @@ class Point(BaseGeometry):
             Easting, northing, and elevation.
         """
         BaseGeometry.__init__(self)
-        self._init_geom(*args)
-
-    def _init_geom(self, *args):
-        if len(args) == 0:
-            # allow creation of null points, to support unpickling
-            pass
-        else:
-            if len(args) == 1:
-                self._geom, self._ndim = geos_point_from_py(args[0])
-            else:
-                self._geom, self._ndim = geos_point_from_py(tuple(args))
+        if len(args) > 0:
+            self._set_coords(*args)
 
     # Coordinate getters and setters
 
@@ -110,14 +101,12 @@ class Point(BaseGeometry):
 
     # Coordinate access
 
-    def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
+    def _set_coords(self, *args):
+        self.empty()
+        if len(args) == 1:
+            self._geom, self._ndim = geos_point_from_py(args[0])
         else:
-            update_point_from_py(self, coordinates)
+            self._geom, self._ndim = geos_point_from_py(tuple(args))
 
     coords = property(BaseGeometry._get_coords, _set_coords)
 

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geometry/polygon.py

@@ -20,11 +20,6 @@ class LinearRing(LineString):
     invalid and operations on it may fail.
     """
     
-    _ndim = None
-    __geom__ = None
-    __p__ = None
-    _owned = False
-
     def __init__(self, coordinates=None):
         """
         Parameters
@@ -46,14 +41,8 @@ class LinearRing(LineString):
           4.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
-        else:
-            self._geom, self._ndim = geos_linearring_from_py(coordinates)
+        if coordinates is not None:
+            self._set_coords(coordinates)
 
     @property
     def __geo_interface__(self):
@@ -67,30 +56,19 @@ class LinearRing(LineString):
     _get_coords = BaseGeometry._get_coords
 
     def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
-        update_linearring_from_py(self, coordinates)
+        self.empty()
+        self._geom, self._ndim = geos_linearring_from_py(coordinates)
 
     coords = property(_get_coords, _set_coords)
 
 
 class LinearRingAdapter(LineStringAdapter):
 
-    context = None
-    __geom__ = None
     __p__ = None
-    _owned = False
 
-    @property
-    def _geom(self):
-        """Keeps the GEOS geometry in synch with the context."""
-        if self.__geom__ is not None:
-            lgeos.GEOSGeom_destroy(self.__geom)
-        self.__geom, n = geos_linearring_from_py(self.context)
-        return self.__geom
+    def __init__(self, context):
+        self.context = context
+        self.factory = geos_linearring_from_py
 
     @property
     def __geo_interface__(self):
@@ -194,8 +172,6 @@ class Polygon(BaseGeometry):
     _exterior = None
     _interiors = []
     _ndim = 2
-    __geom__ = None
-    _owned = False
 
     def __init__(self, shell=None, holes=None):
         """
@@ -276,10 +252,6 @@ class Polygon(BaseGeometry):
 
 class PolygonAdapter(PolygonProxy, Polygon):
     
-    context = None
-    __geom__ = None
-    _owned = False
-
     def __init__(self, shell, holes=None):
         self.shell = shell
         self.holes = holes

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geometry/proxy.py

@@ -2,27 +2,37 @@
 """
 
 from shapely.geos import lgeos
+from shapely import wkb
+
+EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
 
 
 class CachingGeometryProxy(object):
 
     context = None
     factory = None
-    __geom__ = None
+    __geom__ = EMPTY
     _gtag = None
 
     def __init__(self, context):
         self.context = context
 
+    @property
+    def _is_empty(self):
+        return self.__geom__ in [EMPTY, None]
+
+    def empty(self):
+        if not self._is_empty:
+            from shapely.geos import lgeos
+            lgeos.GEOSGeom_destroy(self.__geom__)
+        self.__geom__ = EMPTY
+
     @property
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
         gtag = self.gtag()
-        if gtag != self._gtag:
-            if self.__geom__ is not None:
-                lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__, n = self.factory(self.context)
-        elif self.__geom__ is None:
+        if gtag != self._gtag or self._is_empty:
+            self.empty()
             self.__geom__, n = self.factory(self.context)
         self._gtag = gtag
         return self.__geom__
@@ -37,11 +47,8 @@ class PolygonProxy(CachingGeometryProxy):
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
         gtag = self.gtag()
-        if gtag != self._gtag:
-            if self.__geom__ is not None:
-                lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__, n = self.factory(self.context[0], self.context[1])
-        elif self.__geom__ is None:
+        if gtag != self._gtag or self._is_empty:
+            self.empty()
             self.__geom__, n = self.factory(self.context[0], self.context[1])
         self._gtag = gtag
         return self.__geom__

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/geos.py

@@ -99,7 +99,7 @@ def _geos_c_version():
     v = func().split('-')[2]
     return tuple(int(n) for n in v.split('.'))
 
-geos_c_version = _geos_c_version()
+geos_capi_version = geos_c_version = _geos_c_version()
 
 class allocated_c_char_p(c_char_p):
     pass
@@ -136,6 +136,7 @@ if geos_c_version >= (1,5,0):
     # Handle special case.
     _lgeos.initGEOS_r.restype = c_void_p
     _lgeos.initGEOS_r.argtypes = [c_void_p, c_void_p]
+    _lgeos.finishGEOS_r.argtypes = [c_void_p]
 
 # Exceptions
 
@@ -160,7 +161,7 @@ def notice_handler(fmt, list):
 notice_h = CFUNCTYPE(None, c_char_p, c_char_p)(notice_handler)
 
 def cleanup():
-    if _lgeos is not None:
+    if _lgeos is not None :
         _lgeos.finishGEOS()
 
 atexit.register(cleanup)
@@ -347,7 +348,7 @@ class LGEOS16LR(LGEOS16):
     """Proxy for the reentrant GEOS_C DLL/SO API version 1.6 with linear
     referencing
     """
-    geos_capi_version = (1, 6, 0.5)
+    geos_capi_version = geos_c_version
     def __init__(self, dll):
         super(LGEOS16LR, self).__init__(dll)
         

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/prepared.py

@@ -48,7 +48,7 @@ class PreparedGeometry(object):
         return bool(self.impl['prepared_covers'](self, other))
 
 
-def prep(geom):
-    """Creates and returns a prepared geometry."""
-    return PreparedGeometry(geom)
+def prep(ob):
+    """Creates and returns a prepared geometric object."""
+    return PreparedGeometry(ob)
 

{Shapely-1.2b6 → Shapely-1.2rc1}/shapely/tests/__init__.py

@@ -1,12 +1,13 @@
 from unittest import TestSuite
 
 import test_doctests, test_prepared, test_equality, test_geomseq, test_xy
-import test_collection
+import test_collection, test_emptiness
 
 def test_suite():
     suite = TestSuite()
     suite.addTest(test_doctests.test_suite())
     suite.addTest(test_prepared.test_suite())
+    suite.addTest(test_emptiness.test_suite())
     suite.addTest(test_equality.test_suite())
     suite.addTest(test_geomseq.test_suite())
     suite.addTest(test_xy.test_suite())

Shapely-1.2b6/CREDITS.txt

@@ -1,9 +0,0 @@
-Sean Gillies (Pleiades)
-Howard Butler (Hobu, Inc.)
-Kai Lautaportti (Hexagon IT)
-Frédéric Junod (Camptocamp SA)
-Eric Lemoine (Camptocamp SA)
-Justin Bronn (GeoDjango) for ctypes inspiration
-
-Some of this work was supported by a grant from the U.S. National Endowment for
-the Humanities (http://www.neh.gov).