shapely 1.0.5__tar.gz → 1.0.7__tar.gz

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

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

{Shapely-1.0.5 → Shapely-1.0.7}/CREDITS.txt

@@ -4,7 +4,6 @@ Kai Lautaportti (Hexagon IT)
 Frédéric Junod (Camptocamp SA)
 Eric Lemoine (Camptocamp SA)
 Justin Bronn (GeoDjango) for ctypes inspiration
-Artem Pavlenko (Mapnik) for help with GEOS DLLs
 
 Some of this work was supported by a grant from the U.S. National Endowment for
 the Humanities (http://www.neh.gov).

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

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.5
+Version: 1.0.7
 Summary: Geospatial geometries, predicates, and operations
-Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
+Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sgillies@frii.com
 License: BSD
@@ -21,6 +21,10 @@ Description: Shapely
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
         http://zcologia.com/news/564/shapely-for-python-3-0/.)
         
+        .. note::
+        We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
+        Please contact us if you experience difficulties.
+        
         See also CHANGES.txt_ and HISTORY.txt_.
         
         .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
@@ -161,7 +165,6 @@ Description: Shapely
         * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
         * Eric Lemoine (Camptocamp SA)
         * Justin Bronn (GeoDjango) for ctypes inspiration
-        * Artem Pavlenko (Mapnik) for help with GEOS DLLs
         
         .. |eaigue| unicode:: U+00E9
         :trim:
@@ -169,7 +172,6 @@ Description: Shapely
         Major portions of this work were supported by a grant (to Pleiades) from the
         U.S.  National Endowment for the Humanities (http://www.neh.gov).
         
-        
 Keywords: geometry topology
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable

{Shapely-1.0.5 → Shapely-1.0.7}/README.txt

@@ -13,6 +13,10 @@ to other packages like WorldMill_ and pyproj_. For more information, see:
 Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
 http://zcologia.com/news/564/shapely-for-python-3-0/.)
 
+.. note::
+   We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
+   Please contact us if you experience difficulties.
+
 See also CHANGES.txt_ and HISTORY.txt_.
 
 .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
@@ -153,11 +157,9 @@ Credits
 * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
 * Eric Lemoine (Camptocamp SA)
 * Justin Bronn (GeoDjango) for ctypes inspiration
-* Artem Pavlenko (Mapnik) for help with GEOS DLLs
 
 .. |eaigue| unicode:: U+00E9
    :trim:
 
 Major portions of this work were supported by a grant (to Pleiades) from the
 U.S.  National Endowment for the Humanities (http://www.neh.gov).
-

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

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.5
+Version: 1.0.7
 Summary: Geospatial geometries, predicates, and operations
-Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
+Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
 Author-email: sgillies@frii.com
 License: BSD
@@ -21,6 +21,10 @@ Description: Shapely
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
         http://zcologia.com/news/564/shapely-for-python-3-0/.)
         
+        .. note::
+        We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
+        Please contact us if you experience difficulties.
+        
         See also CHANGES.txt_ and HISTORY.txt_.
         
         .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
@@ -161,7 +165,6 @@ Description: Shapely
         * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
         * Eric Lemoine (Camptocamp SA)
         * Justin Bronn (GeoDjango) for ctypes inspiration
-        * Artem Pavlenko (Mapnik) for help with GEOS DLLs
         
         .. |eaigue| unicode:: U+00E9
         :trim:
@@ -169,7 +172,6 @@ Description: Shapely
         Major portions of this work were supported by a grant (to Pleiades) from the
         U.S.  National Endowment for the Humanities (http://www.neh.gov).
         
-        
 Keywords: geometry topology
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable

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

@@ -49,6 +49,7 @@ tests/Predicates.txt
 tests/__init__.py
 tests/attribute-chains.txt
 tests/binascii_hex.txt
+tests/dimensions.txt
 tests/invalid_intersection.txt
 tests/polygonize.txt
 tests/rungrind.dist

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

@@ -1,4 +1,3 @@
-
 from setuptools import setup, Extension
 from sys import version_info
 
@@ -11,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.5',
+      version       = '1.0.7',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -19,7 +18,7 @@ setup(name          = 'Shapely',
       author_email  = 'sgillies@frii.com',
       maintainer    = 'Sean Gillies',
       maintainer_email  = 'sgillies@frii.com',
-      url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
+      url   = 'http://trac.gispython.org/lab/wiki/Shapely',
       long_description = readme_text,
       packages      = ['shapely', 'shapely.geometry'],
       install_requires = install_requires,
@@ -35,4 +34,3 @@ setup(name          = 'Shapely',
         'Topic :: Scientific/Engineering :: GIS',
         ],
 )
-

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

@@ -1,4 +1,3 @@
-
 from setuptools import setup, Extension
 from sys import version_info
 
@@ -11,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.5',
+      version       = '1.0.7',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -19,10 +18,10 @@ setup(name          = 'Shapely',
       author_email  = 'sgillies@frii.com',
       maintainer    = 'Sean Gillies',
       maintainer_email  = 'sgillies@frii.com',
-      url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
+      url   = 'http://trac.gispython.org/lab/wiki/Shapely',
       long_description = readme_text,
       packages      = ['shapely', 'shapely.geometry'],
-      data_files=[('DLLs', ['DLLs/geos.dll']),],
+      data_files=[('DLLs', ['DLLs/geos.dll', 'DLLs/libgeos-3-0-0.dll']),],
       install_requires = install_requires,
       #tests_require = ['numpy'], -- not working with "tests" command
       test_suite = 'tests.test_suite',
@@ -36,4 +35,3 @@ setup(name          = 'Shapely',
         'Topic :: Scientific/Engineering :: GIS',
         ],
 )
-

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

@@ -262,6 +262,8 @@ class BaseGeometry(object):
     def __del__(self):
         if self.__geom__ is not None and not self._owned:
             lgeos.GEOSGeom_destroy(self.__geom__)
+        self.__geom__ = None
+        self.__p__ = None
 
     def __str__(self):
         return self.to_wkt()

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

@@ -7,7 +7,7 @@ from linestring import LineString, asLineString
 from polygon import Polygon, asPolygon
 from multipoint import MultiPoint, asMultiPoint
 from multilinestring import MultiLineString, asMultiLineString
-from multipolygon import MultiPolygon, asMultiPolygon
+from multipolygon import MultiPolygon, MultiPolygonAdapter, asMultiPolygon
 
 
 def shape(context):
@@ -30,7 +30,7 @@ def shape(context):
     elif geom_type == "multilinestring":
         return MultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
-        return MultiPolygon(ob["coordinates"])
+        return MultiPolygon(ob["coordinates"], context_type='geojson')
     else:
         raise ValueError, "Unknown geometry type: %s" % geom_type
 
@@ -59,6 +59,6 @@ def asShape(context):
     elif geom_type == "multilinestring":
         return asMultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
-        return asMultiPolygon(ob["coordinates"])
+        return MultiPolygonAdapter(ob["coordinates"], context_type='geojson')
     else:
         raise ValueError, "Unknown geometry type: %s" % geom_type

{Shapely-1.0.5 → Shapely-1.0.7}/shapely/geometry/multipolygon.py

@@ -11,6 +11,20 @@ from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_multipolygon_from_py(ob):
+    """ob must provide Python geo interface coordinates."""
+    L = len(ob)
+    N = len(ob[0][0][0])
+    assert L >= 1
+    assert N == 2 or N == 3
+
+    subs = (c_void_p * L)()
+    for l in xrange(L):
+        geom, ndims = geos_polygon_from_py(ob[l][0], ob[l][1:])
+        subs[l] = cast(geom, c_void_p)
+            
+    return (lgeos.GEOSGeom_createCollection(6, subs, L), N)
+
+def geos_multipolygon_from_polygons(ob):
     """ob must be either a sequence or array of sequences or arrays."""
     L = len(ob)
     N = len(ob[0][0][0])
@@ -25,12 +39,13 @@ def geos_multipolygon_from_py(ob):
     return (lgeos.GEOSGeom_createCollection(6, subs, L), N)
 
 
+
 class MultiPolygon(BaseGeometry):
 
     """a multiple polygon geometry.
     """
 
-    def __init__(self, polygons=None):
+    def __init__(self, polygons=None, context_type='polygons'):
         """Initialize.
 
         Parameters
@@ -55,7 +70,9 @@ class MultiPolygon(BaseGeometry):
         if polygons is None:
             # allow creation of null collections, to support unpickling
             pass
-        else:
+        elif context_type == 'polygons':
+            self._geom, self._ndim = geos_multipolygon_from_polygons(polygons)
+        elif context_type == 'geojson':
             self._geom, self._ndim = geos_multipolygon_from_py(polygons)
 
     @property
@@ -111,9 +128,12 @@ class MultiPolygonAdapter(CachingGeometryProxy, MultiPolygon):
     context = None
     _owned = False
 
-    def __init__(self, context):
+    def __init__(self, context, context_type='polygons'):
         self.context = context
-        self.factory = geos_multipolygon_from_py
+        if context_type == 'geojson':
+            self.factory = geos_multipolygon_from_py
+        elif context_type == 'polygons':
+            self.factory = geos_multipolygon_from_polygons
 
     @property
     def _ndim(self):

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

@@ -3,7 +3,7 @@ Polygons and their linear ring components.
 """
 
 from ctypes import byref, c_double, c_int, c_void_p, cast, POINTER, pointer
-
+import weakref
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry, exceptNull
 from shapely.geometry.linestring import LineString, LineStringAdapter
@@ -143,7 +143,7 @@ class LinearRing(LineString):
     """A linear ring.
     """
 
-    _ndim = 2
+    _ndim = None
     __geom__ = None
     __p__ = None
     _owned = False
@@ -233,6 +233,8 @@ class InteriorRingSequence(object):
     _ndim = None
     _index = 0
     _length = 0
+    __rings__ = None
+    _gtag = None
 
     def __init__(self, parent):
         self.__p__ = parent
@@ -246,11 +248,9 @@ class InteriorRingSequence(object):
 
     def next(self):
         if self._index < self._length:
-            g = LinearRing()
-            g._owned = True
-            g._geom = lgeos.GEOSGetInteriorRingN(self._geom, self._index)
+            ring = self._get_ring(self._index)
             self._index += 1
-            return g
+            return ring
         else:
             raise StopIteration 
 
@@ -265,10 +265,7 @@ class InteriorRingSequence(object):
             ii = M + i
         else:
             ii = i
-        g = LinearRing()
-        g._owned = True
-        g._geom = lgeos.GEOSGetInteriorRingN(self._geom, ii)
-        return g
+        return self._get_ring(i)
 
     @property
     def _longest(self):
@@ -278,6 +275,23 @@ class InteriorRingSequence(object):
             if l > max:
                 max = l
 
+    def gtag(self):
+        return hash(repr(self.__p__))
+
+    def _get_ring(self, i):
+        gtag = self.gtag()
+        if gtag != self._gtag:
+            self.__rings__ = {}
+        if i not in self.__rings__:
+            g = lgeos.GEOSGetInteriorRingN(self._geom, i)
+            ring = LinearRing()
+            ring.__geom__ = g
+            ring.__p__ = self
+            ring._owned = True
+            ring._ndim = self._ndim
+            self.__rings__[i] = weakref.ref(ring)
+        return self.__rings__[i]()
+        
 
 def geos_polygon_from_py(shell, holes=None):
     if shell is not None:
@@ -344,16 +358,15 @@ class Polygon(BaseGeometry):
     @property
     @exceptNull
     def exterior(self):
-        if self._exterior is None:
-            # A polygon created from the abstract factory will have a null
-            # _exterior attribute.
-            ring = lgeos.GEOSGetExteriorRing(self._geom)
-            self._exterior = LinearRing()
-            self._exterior._geom = ring
-            # The ring needs to hold an extra ref to the polygon
-            self.__p__ = self
-            self._exterior._owned = True
-        return self._exterior
+        if self._exterior is None or self._exterior() is None:
+            g = lgeos.GEOSGetExteriorRing(self._geom)
+            ring = LinearRing()
+            ring.__geom__ = g
+            ring.__p__ = self
+            ring._owned = True
+            ring._ndim = self._ndim
+            self._exterior = weakref.ref(ring)
+        return self._exterior()
 
     @property
     @exceptNull

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

@@ -23,12 +23,14 @@ class BinaryPredicate(object):
         self.fn.errcheck = errcheck
 
     def __get__(self, obj, objtype=None):
+        if not obj._geom:
+            raise ValueError, "Null geometry supports no operations"
         self.context = obj
         return self
 
     def __call__(self, other):
-        if not self.context._geom or not other._geom:
-            raise ValueError, "Null geometry supports no operations"
+        if not other._geom:
+            raise ValueError, "Null geometry can not be operated upon"
         return bool(self.fn(self.context._geom, other._geom))
 
 

{Shapely-1.0.5 → Shapely-1.0.7}/tests/GeoInterface.txt

@@ -61,7 +61,7 @@ Test implementation of geo interface
 
   multi polygon
 
-  >>> shape = asShape({'type': 'MultiPolygon', 'coordinates': [(((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0), (0.0, 0.0)), [((0.10000000000000001, 0.10000000000000001), (0.10000000000000001, 0.20000000000000001), (0.20000000000000001, 0.20000000000000001), (0.20000000000000001, 0.10000000000000001), (0.10000000000000001, 0.10000000000000001))])]})
+  >>> shape = asShape({'type': 'MultiPolygon', 'coordinates': [(((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0), (0.0, 0.0)), ((0.10000000000000001, 0.10000000000000001), (0.10000000000000001, 0.20000000000000001), (0.20000000000000001, 0.20000000000000001), (0.20000000000000001, 0.10000000000000001), (0.10000000000000001, 0.10000000000000001)))]})
   >>> shape # doctest: +ELLIPSIS
   <shapely.geometry.multipolygon.MultiPolygonAdapter object at ...>
   >>> len(shape.geoms)

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

@@ -25,7 +25,6 @@ Initialization
   >>> ring.__geo_interface__
   {'type': 'LinearRing', 'coordinates': ((0.0, 0.0), (0.0, 2.0), (2.0, 2.0), (2.0, 0.0), (0.0, 0.0))}
 
-
   Test ring adapter
 
   >>> coords = [[0.0, 0.0], [0.0, 1.0], [1.0, 1.0], [1.0, 0.0]]

Shapely-1.0.7/tests/dimensions.txt

@@ -0,0 +1,17 @@
+Background: see http://trac.gispython.org/lab/ticket/168
+
+  >>> from shapely.geometry import Polygon
+  >>> coords = ((0.0, 0.0, 0.0), (0.0, 1.0, 0.0), (1.0, 1.0, 0.0), (1.0, 0.0, 0.0))
+  >>> polygon = Polygon(coords)
+  >>> polygon._ndim
+  3
+  >>> gi = polygon.__geo_interface__
+  >>> gi['coordinates']
+  (((0.0, 0.0, 0.0), (0.0, 1.0, 0.0), (1.0, 1.0, 0.0), (1.0, 0.0, 0.0), (0.0, 0.0, 0.0)),)
+
+  >>> e = polygon.exterior
+  >>> e._ndim
+  3
+  >>> gi = e.__geo_interface__
+  >>> gi['coordinates']
+  ((0.0, 0.0, 0.0), (0.0, 1.0, 0.0), (1.0, 1.0, 0.0), (1.0, 0.0, 0.0), (0.0, 0.0, 0.0))