shapely 1.0a7__py2.4.egg → 1.0b2__py2.4.egg

EGG-INFO/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0a7
+Version: 1.0b2
 Summary: Geospatial geometries, predicates, and operations
-Home-page: http://trac.gispython.org/projects/PCL/wiki/ShapeLy
+Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
 Author-email: sgillies@frii.com
-License: LGPL
+License: BSD
 Description: Shapely
         =======
         
@@ -20,9 +20,6 @@ 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/.)
         
-        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
-        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
-        
         Dependencies
         ------------
         
@@ -121,13 +118,25 @@ Description: Shapely
         There are also two test runners under tests/. test_doctests.py requires
         zope.testing. runalldoctests.py does not.
         
+        Support
+        -------
+        
+        For current information about this project, see the wiki_.
+        
+        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
+        
+        If you have questions, please consider joining our community list:
+        
+        http://trac.gispython.org/projects/PCL/wiki/CommunityList
+        
         
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: GIS

EGG-INFO/SOURCES.txt

@@ -1,4 +1,7 @@
+CHANGES.txt
 CREDITS.txt
+HISTORY.txt
+LICENSE.txt
 README.txt
 setup.py
 Shapely.egg-info/PKG-INFO
@@ -39,7 +42,8 @@ tests/Point.txt
 tests/Polygon.txt
 tests/Predicates.txt
 tests/__init__.py
-tests/runalldoctests.py
+tests/binascii_hex.txt
+tests/invalid_intersection.txt
 tests/rungrind.dist
-tests/runtests.dist
 tests/test_doctests.py
+tests/valgrind-python.supp

shapely/geometry/base.py

@@ -3,17 +3,34 @@ 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.predicates import BinaryPredicate, UnaryPredicate
 from shapely.topology import BinaryTopologicalOp, UnaryTopologicalOp
 
 
+GEOMETRY_TYPES = [
+    'Point',
+	'LineString',
+	'LinearRing',
+	'Polygon',
+	'MultiPoint',
+	'MultiLineString',
+	'MultiPolygon',
+	'GeometryCollection'
+    ]
+
+def geometry_type_name(g):
+    return GEOMETRY_TYPES[lgeos.GEOSGeomTypeId(g)]
+
 # Abstract geometry factory for use with topological methods below
 
 def geom_factory(g):
+    if not g:
+        raise ValueError, "No Shapely geometry can be created from this null value"
     ob = BaseGeometry()
-    geom_type = string_at(lgeos.GEOSGeomType(g))
+    geom_type = geometry_type_name(g)
     # TODO: check cost of dynamic import by profiling
     mod = __import__(
         'shapely.geometry', 
@@ -186,6 +203,20 @@ class BaseGeometry(object):
         To be overridden by extension classes."""
         raise NotImplementedError
 
+    @property
+    def array_interface_base(self):
+        if sys.byteorder == 'little':
+            typestr = '<f8'
+        elif sys.byteorder == 'big':
+            typestr = '>f8'
+        else:
+            raise ValueError, "Unsupported byteorder: neither little nor big-endian"
+        return {
+            'version': 3,
+            'typestr': typestr,
+            'data': self.ctypes,
+            }
+
     @property
     def __array_interface__(self):
         """Provide the Numpy array protocol."""
@@ -214,7 +245,7 @@ class BaseGeometry(object):
 
     def geometryType(self):
         """Returns a string representing the geometry type, e.g. 'Polygon'."""
-        return string_at(lgeos.GEOSGeomType(self._geom))
+        return geometry_type_name(self._geom)
 
     def to_wkb(self):
         """Returns a WKB byte string representation of the geometry."""

shapely/geometry/linestring.py

@@ -154,15 +154,12 @@ class LineString(BaseGeometry):
             self._ctypes_data = data
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (len(self.coords), self._ndim),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (len(self.coords), self._ndim)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     # Coordinate access
 
@@ -210,12 +207,7 @@ class LineStringAdapter(LineString):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
     coords = property(BaseGeometry.get_coords)
 

shapely/geometry/multipoint.py

@@ -108,15 +108,12 @@ class MultiPoint(BaseGeometry):
             self._ctypes_data = data
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (len(self.geoms), self._ndim),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (len(self.geoms), self._ndim)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     @property
     def coords(self):
@@ -166,12 +163,7 @@ class MultiPointAdapter(MultiPoint):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
 
 def asMultiPoint(context):

shapely/geometry/point.py

@@ -159,15 +159,12 @@ class Point(BaseGeometry):
             self._ctypes_data = array
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (self._ndim,),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (self._ndim,)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     @property
     def bounds(self):
@@ -225,15 +222,11 @@ class PointAdapter(Point):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
     coords = property(BaseGeometry.get_coords)
 
+
 def asPoint(context):
     """Factory for PointAdapter instances."""
     return PointAdapter(context)

shapely/topology.py

@@ -26,7 +26,17 @@ class BinaryTopologicalOp(object):
         return self
 
     def __call__(self, other):
-        return self.factory(self.fn(self.context._geom, other._geom))
+        product = self.fn(self.context._geom, other._geom)
+        if not product:
+            # Check validity of geometries
+            if not self.context.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the geometry %s" % (self.fn.__name__, repr(self.context))
+            elif not other.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the 'other' geometry %s" % (self.fn.__name__, repr(other))
+
+        return self.factory(product)
 
 
 class UnaryTopologicalOp(object):

shapely/json.py

@@ -1,47 +0,0 @@
-"""
-Load/dump geometries using JSON.
-
-Includes a JSON-based abstract geometry factory.
-"""
-
-import geojson
-
-def json_factory(ob):
-    """Attempts to create a geometry from JSON.
-    
-    Else, returns the original data.
-    """
-    try:
-        coords = ob.get('coordinates', [])
-        geom_type = str(ob.get('type'))
-        mod = __import__(
-            'shapely.geometry', 
-            globals(), 
-            locals(), 
-            [geom_type],
-            )
-        geom_class = getattr(mod, geom_type)
-        return geom_class(*coords)
-    except (KeyError, TypeError):
-        raise 
-    return ob
-
-# Pickle-like convenience functions
-
-def loads(data):
-    """Load a geometry from a GeoJSON representation."""
-    return geojson.loads(data, json_factory)
-
-def load(fp):
-    """Load a geometry from an open file."""
-    data = fp.read()
-    return loads(data)
-
-def dumps(ob):
-    """Dump a GeoJSON representation of a geometry to a string."""
-    return geojson.dumps(ob)
-
-def dump(ob, fp):
-    """Dump a geometry to an open file."""
-    fp.write(dumps(ob))
-