shapely 1.0.5__tar.gz → 1.0.6__tar.gz

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

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

{Shapely-1.0.5 → Shapely-1.0.6}/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.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.5
+Version: 1.0.6
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -161,7 +161,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:

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

@@ -153,7 +153,6 @@ 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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.5
+Version: 1.0.6
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -161,7 +161,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:

{Shapely-1.0.5 → Shapely-1.0.6}/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.5',
+      version       = '1.0.6',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.5 → Shapely-1.0.6}/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.5',
+      version       = '1.0.6',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -22,7 +22,7 @@ setup(name          = 'Shapely',
       url   = 'http://trac.gispython.org/projects/PCL/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',

{Shapely-1.0.5 → Shapely-1.0.6}/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.6}/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.6}/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.6}/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)