shapely 1.0.3__tar.gz → 1.0.4__tar.gz

Shapely-1.0.4/CHANGES.txt

@@ -0,0 +1,18 @@
+All tickets are children of http://trac.gispython.org/projects/PCL/ticket/
+
+1.0.4 (2008-05-01)
+------------------
+- Disentangle Python and topological equality (#163).
+- Add shape(), a factory that copies coordinates from a geo interface provider.
+  To be used instead of asShape() unless you really need to store coordinates
+  outside shapely for efficient use in other code.
+- Cache GEOS geometries in adapters (#163).
+
+1.0.3 (2008-04-09)
+------------------
+- Do not release GIL when calling GEOS functions (#158).
+- Prevent faults when chaining multiple GEOS operators (#159).
+
+1.0.2 (2008-02-26)
+------------------
+- Fix loss of dimensionality in polygon rings (#155).

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

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

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

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

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

@@ -32,6 +32,7 @@ shapely/geometry/multipoint.py
 shapely/geometry/multipolygon.py
 shapely/geometry/point.py
 shapely/geometry/polygon.py
+shapely/geometry/proxy.py
 tests/Array.txt
 tests/GeoInterface.txt
 tests/IterOps.txt

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

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

@@ -1,4 +1,4 @@
-from geo import asShape
+from geo import shape, asShape
 from point import Point, asPoint
 from linestring import LineString, asLineString
 from polygon import Polygon, asPolygon

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

@@ -248,12 +248,6 @@ class BaseGeometry(object):
     def __str__(self):
         return self.to_wkt()
 
-    def __eq__(self, other):
-        return self.equals(other)
-    
-    def __ne__(self, other):
-        return not self.equals(other)
-
     # To support pickling
 
     def __reduce__(self):

Shapely-1.0.4/shapely/geometry/geo.py

@@ -0,0 +1,61 @@
+"""
+Geometry factories based on the geo interface.
+"""
+
+from point import Point, asPoint
+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
+
+
+def shape(context):
+    """Return a new, independent geometry with coordinates *copied* from the
+    context.
+    """
+    if hasattr(context, "__geo_interface__"):
+        ob = context.__geo_interface__
+    else:
+        ob = context
+    geom_type = ob.get("type").lower()
+    if geom_type == "point":
+        return Point(ob["coordinates"])
+    elif geom_type == "linestring":
+        return LineString(ob["coordinates"])
+    elif geom_type == "polygon":
+        return Polygon(ob["coordinates"][0], ob["coordinates"][1:])
+    elif geom_type == "multipoint":
+        return MultiPoint(ob["coordinates"])
+    elif geom_type == "multilinestring":
+        return MultiLineString(ob["coordinates"])
+    elif geom_type == "multipolygon":
+        return MultiPolygon(ob["coordinates"])
+    else:
+        raise ValueError, "Unknown geometry type: %s" % geom_type
+
+def asShape(context):
+    """Adapts the context to a geometry interface. The coordinates remain
+    stored in the context.
+    """
+    if hasattr(context, "__geo_interface__"):
+        ob = context.__geo_interface__
+    else:
+        ob = context
+
+    geom_type = ob.get("type").lower()
+
+    if geom_type == "point":
+        return asPoint(ob["coordinates"])
+    elif geom_type == "linestring":
+        return asLineString(ob["coordinates"])
+    elif geom_type == "polygon":
+        return asPolygon(ob["coordinates"][0], ob["coordinates"][1:])
+    elif geom_type == "multipoint":
+        return asMultiPoint(ob["coordinates"])
+    elif geom_type == "multilinestring":
+        return asMultiLineString(ob["coordinates"])
+    elif geom_type == "multipolygon":
+        return asMultiPolygon(ob["coordinates"])
+    else:
+        raise ValueError, "Unknown geometry type: %s" % geom_type

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

@@ -7,6 +7,7 @@ from ctypes import ArgumentError
 
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry, exceptNull
+from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
@@ -157,18 +158,18 @@ class LineString(BaseGeometry):
     coords = property(BaseGeometry._get_coords, _set_coords)
 
 
-class LineStringAdapter(LineString):
+class LineStringAdapter(CachingGeometryProxy, LineString):
 
     """Adapts a Python coordinate pair or a numpy array to the line string
     interface.
     """
     
     context = None
-    #__geom = None
     _owned = False
 
     def __init__(self, context):
         self.context = context
+        self.factory = geos_linestring_from_py
 
     @property
     def _ndim(self):
@@ -182,14 +183,6 @@ class LineStringAdapter(LineString):
             # Fall back on list
             return len(self.context[0])
 
-    @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_linestring_from_py(self.context)
-        return self.__geom__
-
     @property
     def __array_interface__(self):
         """Provide the Numpy array protocol."""
@@ -220,4 +213,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

{Shapely-1.0.3 → Shapely-1.0.4}/shapely/geometry/multilinestring.py

@@ -7,6 +7,7 @@ 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, exceptNull
 from shapely.geometry.linestring import LineString, geos_linestring_from_py
+from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_multilinestring_from_py(ob):
@@ -115,18 +116,18 @@ class MultiLineString(BaseGeometry):
         return GeometrySequence(self, LineString)
 
 
-class MultiLineStringAdapter(MultiLineString):
+class MultiLineStringAdapter(CachingGeometryProxy, MultiLineString):
 
     """Adapts sequences of sequences or numpy arrays to the multilinestring
     interface.
     """
     
     context = None
-    #__geom = None
     _owned = False
 
     def __init__(self, context):
         self.context = context
+        self.factory = geos_multilinestring_from_py
 
     @property
     def _ndim(self):
@@ -140,14 +141,6 @@ class MultiLineStringAdapter(MultiLineString):
             # Fall back on list
             return len(self.context[0][0])
 
-    @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__ = geos_multilinestring_from_py(self.context)[0]
-        return self.__geom__
-
 
 def asMultiLineString(context):
     """Factory for MultiLineStringAdapter instances."""
@@ -162,4 +155,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

{Shapely-1.0.3 → Shapely-1.0.4}/shapely/geometry/multipoint.py

@@ -7,6 +7,7 @@ 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, exceptNull
 from shapely.geometry.point import Point, geos_point_from_py
+from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_multipoint_from_py(ob):
@@ -137,18 +138,18 @@ class MultiPoint(BaseGeometry):
         return GeometrySequence(self, Point)
         
 
-class MultiPointAdapter(MultiPoint):
+class MultiPointAdapter(CachingGeometryProxy, MultiPoint):
 
     """Adapts a Python coordinate pair or a numpy array to the multipoint
     interface.
     """
     
     context = None
-    #__geom__ = None
     _owned = False
 
     def __init__(self, context):
         self.context = context
+        self.factory = geos_multipoint_from_py
 
     @property
     def _ndim(self):
@@ -162,14 +163,6 @@ class MultiPointAdapter(MultiPoint):
             # Fall back on list
             return len(self.context[0])
 
-    @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_multipoint_from_py(self.context)
-        return self.__geom__
-
     @property
     def __array_interface__(self):
         """Provide the Numpy array protocol."""
@@ -192,4 +185,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

{Shapely-1.0.3 → Shapely-1.0.4}/shapely/geometry/multipolygon.py

@@ -7,6 +7,7 @@ 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, exceptNull
 from shapely.geometry.polygon import Polygon, geos_polygon_from_py
+from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_multipolygon_from_py(ob):
@@ -101,18 +102,18 @@ class MultiPolygon(BaseGeometry):
         return GeometrySequence(self, Polygon)
 
 
-class MultiPolygonAdapter(MultiPolygon):
+class MultiPolygonAdapter(CachingGeometryProxy, MultiPolygon):
 
     """Adapts sequences of sequences or numpy arrays to the multipolygon
     interface.
     """
     
     context = None
-    #__geom = None
     _owned = False
 
     def __init__(self, context):
         self.context = context
+        self.factory = geos_multipolygon_from_py
 
     @property
     def _ndim(self):
@@ -126,14 +127,6 @@ class MultiPolygonAdapter(MultiPolygon):
             # Fall back on list
             return len(self.context[0][0][0])
 
-    @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__ = geos_multipolygon_from_py(self.context)[0]
-        return self.__geom__
-
 
 def asMultiPolygon(context):
     """Factory for MultiLineStringAdapter instances."""
@@ -148,4 +141,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

{Shapely-1.0.3 → Shapely-1.0.4}/shapely/geometry/point.py

@@ -10,6 +10,7 @@ from ctypes import cast, POINTER
 from shapely.geos import lgeos, DimensionError
 from shapely.geometry.base import BaseGeometry, CoordinateSequence
 from shapely.geometry.base import exceptNull
+from shapely.geometry.proxy import CachingGeometryProxy
 
 
 def geos_point_from_py(ob, update_geom=None, update_ndim=0):
@@ -199,17 +200,16 @@ class Point(BaseGeometry):
     coords = property(BaseGeometry._get_coords, _set_coords)
 
 
-class PointAdapter(Point):
+class PointAdapter(CachingGeometryProxy, Point):
 
     """Adapts a Python coordinate pair or a numpy array to the point interface.
     """
 
-    context = None
-    __geom = None
     _owned = False
 
     def __init__(self, context):
         self.context = context
+        self.factory = geos_point_from_py
 
     @property
     def _ndim(self):
@@ -223,14 +223,6 @@ class PointAdapter(Point):
             # Fall back on list
             return len(self.context)
 
-    @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_point_from_py(self.context)
-        return self.__geom
-
     # TODO: reimplement x, y, z properties without calling invoking _geom
 
     @property
@@ -262,4 +254,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

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

@@ -7,6 +7,7 @@ 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, exceptNull
 from shapely.geometry.linestring import LineString, LineStringAdapter
+from shapely.geometry.proxy import PolygonProxy
 
 
 def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
@@ -76,7 +77,7 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         m = len(ob)
         n = len(ob[0])
         assert m >= 2
-        assert n == 2 or n == 3
+        assert (n == 2 or n == 3)
 
         # Add closing coordinates if not provided
         if ob[0][0] != ob[-1][0] or ob[0][1] != ob[-1][1]:
@@ -282,10 +283,7 @@ def geos_polygon_from_py(shell, holes=None):
         if holes:
             ob = holes
             L = len(ob)
-            try:
-                N = len(ob[0][0])
-            except:
-                import pdb; pdb.set_trace()
+            N = len(ob[0][0])
             assert L >= 1
             assert N == 2 or N == 3
 
@@ -395,7 +393,7 @@ class Polygon(BaseGeometry):
             }
 
 
-class PolygonAdapter(Polygon):
+class PolygonAdapter(PolygonProxy, Polygon):
 
     """Adapts sequences of sequences or numpy arrays to the polygon
     interface.
@@ -408,6 +406,8 @@ class PolygonAdapter(Polygon):
     def __init__(self, shell, holes=None):
         self.shell = shell
         self.holes = holes
+        self.context = (shell, holes)
+        self.factory = geos_polygon_from_py
 
     @property
     def _ndim(self):
@@ -421,14 +421,6 @@ class PolygonAdapter(Polygon):
             # Fall back on list
             return len(self.shell[0])
 
-    @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__ = geos_polygon_from_py(self.shell, self.holes)[0]  
-        return self.__geom__
-
 
 def asPolygon(shell, holes=None):
     """Factory for PolygonAdapter instances."""
@@ -442,4 +434,3 @@ def _test():
 
 if __name__ == "__main__":
     _test()
-

Shapely-1.0.4/shapely/geometry/proxy.py

@@ -0,0 +1,48 @@
+"""
+Proxy for coordinates stored outside Shapely geometries.
+"""
+
+from shapely.geos import lgeos
+
+
+class CachingGeometryProxy(object):
+
+    context = None
+    factory = None
+    __geom__ = None
+    _gtag = None
+
+    def __init__(self, context):
+        self.context = context
+
+    @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:
+            self.__geom__, n = self.factory(self.context)
+        self._gtag = gtag
+        return self.__geom__
+        
+    def gtag(self):
+        return hash(repr(self.context))
+
+
+class PolygonProxy(CachingGeometryProxy):
+
+    @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[0], self.context[1])
+        elif self.__geom__ is None:
+            self.__geom__, n = self.factory(self.context[0], self.context[1])
+        self._gtag = gtag
+        return self.__geom__

{Shapely-1.0.3 → Shapely-1.0.4}/tests/LineString.txt

@@ -97,8 +97,8 @@ Now, the inverse
 
     >>> la.__array_interface__ == la.context.__array_interface__
     True
-    >>> as = asarray(la)
-    >>> as
+    >>> pas = asarray(la)
+    >>> pas
     array([[ 1.,  2.],
            [ 3.,  4.]])
 

{Shapely-1.0.3 → Shapely-1.0.4}/tests/MultiPoint.txt

@@ -71,8 +71,8 @@ Adapter
   >>> geoma.__array_interface__ == geoma.context.__array_interface__
   True
   >>> from numpy import asarray
-  >>> as = asarray(geoma)
-  >>> as
+  >>> pas = asarray(geoma)
+  >>> pas
   array([[ 1.,  2.],
          [ 3.,  4.]])
 

{Shapely-1.0.3 → Shapely-1.0.4}/tests/Point.txt

@@ -99,8 +99,8 @@ Adapter
   >>> pa.__array_interface__ == pa.context.__array_interface__
   True
   >>> from numpy import asarray
-  >>> as = asarray(pa)
-  >>> as
+  >>> pas = asarray(pa)
+  >>> pas
   array([ 1.,  2.])
 
   Adapt a coordinate list to a point
@@ -123,8 +123,8 @@ Adapter
   Now, the inverse
   
   >>> ai = pa.__array_interface__
-  >>> as = asarray(pa)
-  >>> as
+  >>> pas = asarray(pa)
+  >>> pas
   array([ 1.,  4.])
 
 Test Non-operability of Null geometry

{Shapely-1.0.3 → Shapely-1.0.4}/tests/Predicates.txt

@@ -28,13 +28,7 @@ Binary Predicates
   >>> point.equals(Point(-1.0, -1.0))
   False
 
-  >>> point == Point(0.0, 0.0)
-  True
-
-  >>> point == Point(-1.0, -1.0)
-  False
-
-  >>> point != Point(-1.0, -1.0)
+  >>> point.equals(Point(0.0, 0.0))
   True
 
 Unary Predicates

Shapely-1.0.3/CHANGES.txt

@@ -1,10 +0,0 @@
-All tickets are children of http://trac.gispython.org/projects/PCL/ticket/
-
-1.0.3 (2008-04-09)
-------------------
-- Do not release GIL when calling GEOS functions (#158).
-- Prevent faults when chaining multiple GEOS operators (#159).
-
-1.0.2 (2008-02-26)
-------------------
-- Fix loss of dimensionality in polygon rings (#155).

Shapely-1.0.3/shapely/geometry/geo.py

@@ -1,35 +0,0 @@
-
-from point import PointAdapter
-from linestring import LineStringAdapter
-from polygon import PolygonAdapter
-from multipoint import MultiPointAdapter
-from multilinestring import MultiLineStringAdapter
-from multipolygon import MultiPolygonAdapter
-
-
-def asShape(context):
-    """Adapts the context to a geometry interface. The coordinates remain
-    stored in the context.
-    """
-    if hasattr(context, "__geo_interface__"):
-        ob = context.__geo_interface__
-    else:
-        ob = context
-
-    geom_type = ob.get("type").lower()
-
-    if geom_type == "point":
-        return PointAdapter(ob["coordinates"])
-    elif geom_type == "linestring":
-        return LineStringAdapter(ob["coordinates"])
-    elif geom_type == "polygon":
-        return PolygonAdapter(ob["coordinates"][0], ob["coordinates"][1:])
-    elif geom_type == "multipoint":
-        return MultiPointAdapter(ob["coordinates"])
-    elif geom_type == "multilinestring":
-        return MultiLineStringAdapter(ob["coordinates"])
-    elif geom_type == "multipolygon":
-        return MultiPolygonAdapter(ob["coordinates"])
-    else:
-        raise ValueError, "Unknown geometry type: %s" % geom_type
-