shapely 1.2.2__tar.gz → 1.2.4__tar.gz

{Shapely-1.2.2 → Shapely-1.2.4}/CHANGES.txt

@@ -1,5 +1,17 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.2.4 (2010-09-09)
+------------------
+- Raise AttributeError when there's no backend support for a method.
+- Raise OSError if libgeos_c.so (or variants) can't be found and loaded.
+- Add geos_c DLL loading support for linux platforms where find_library
+  doesn't work.
+
+1.2.3 (2010-08-17)
+------------------
+- Add mapping function.
+- Fix problem with GEOSisValidReason symbol for GEOS < 3.1.
+
 1.2.2 (2010-07-23)
 ------------------
 - Add representative_point method.

{Shapely-1.2.2 → Shapely-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.2
+Version: 1.2.4
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.2.2 → Shapely-1.2.4}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.2
+Version: 1.2.4
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.2.2 → Shapely-1.2.4}/Shapely.egg-info/SOURCES.txt

@@ -60,10 +60,13 @@ shapely/tests/linear-referencing.txt
 shapely/tests/linemerge.txt
 shapely/tests/polygonize.txt
 shapely/tests/test_collection.py
+shapely/tests/test_delegated.py
+shapely/tests/test_dlls.py
 shapely/tests/test_doctests.py
 shapely/tests/test_emptiness.py
 shapely/tests/test_equality.py
 shapely/tests/test_geomseq.py
+shapely/tests/test_mapping.py
 shapely/tests/test_prepared.py
 shapely/tests/test_singularity.py
 shapely/tests/test_validation.py

{Shapely-1.2.2 → Shapely-1.2.4}/docs/_build/html/_sources/manual.txt

@@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview)
 =====================================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.1
-:Date: 13 July 2010
+:Revision: 1.2.3
+:Date: 19 August 2010
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -214,7 +214,7 @@ General Attributes and Methods
   geometric object.
 
 .. note::
-  This is not in the general the same as the centroid.
+  This is not in general the same as the centroid.
 
 .. sourcecode:: pycon
 
@@ -224,11 +224,6 @@ General Attributes and Methods
   >>> donut.representative_point().wkt
   'POINT (-1.5000000000000000 0.0000000000000000)'
 
-.. sourcecode:: pycon
-
-  >>> Point(0,0).distance(Point(1,1))
-  1.4142135623730951
-
 .. _points:
 
 Points
@@ -1387,8 +1382,8 @@ Figure 1. Convex hull (blue) of 2 points (left) and of 6 points (right).
 
 .. attribute:: object.envelope
 
-  Returns a representation of the point or smallest rectangular polygon that
-  contains the object.
+  Returns a representation of the point or smallest rectangular polygon (with
+  sides parallel to the coordinate axes) that contains the object.
 
 .. sourcecode:: pycon
 
@@ -1714,6 +1709,28 @@ Or a simple placemark-type object:
   >>> list(shape.coords)
   [(0.0, 0.0)]
 
+The GeoJSON-like mapping of a geometric object can be obtained using
+:func:`shapely.geometry.mapping`.
+
+.. function:: shapely.geometry.mapping(ob)
+
+   Return a new, independent geometry with coordinates `copied` from the
+   context.
+
+   `New in version 1.2.3`.
+
+For example, using the same `GeoThing` class:
+
+.. sourcecode:: pycon
+
+  >>> from shapely.geometry import mapping
+  >>> thing = GeoThing({"type": "Point", "coordinates": (0.0, 0.0)})
+  >>> m = mapping(thing)
+  >>> m['type']
+  'Point'
+  >>> m['coordinates']
+  (0.0, 0.0)}
+
 Conclusion
 ==========
 

{Shapely-1.2.2 → Shapely-1.2.4}/docs/manual.txt

@@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview)
 =====================================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.1
-:Date: 13 July 2010
+:Revision: 1.2.3
+:Date: 19 August 2010
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -214,7 +214,7 @@ General Attributes and Methods
   geometric object.
 
 .. note::
-  This is not in the general the same as the centroid.
+  This is not in general the same as the centroid.
 
 .. sourcecode:: pycon
 
@@ -1382,8 +1382,8 @@ Figure 1. Convex hull (blue) of 2 points (left) and of 6 points (right).
 
 .. attribute:: object.envelope
 
-  Returns a representation of the point or smallest rectangular polygon that
-  contains the object.
+  Returns a representation of the point or smallest rectangular polygon (with
+  sides parallel to the coordinate axes) that contains the object.
 
 .. sourcecode:: pycon
 
@@ -1709,6 +1709,28 @@ Or a simple placemark-type object:
   >>> list(shape.coords)
   [(0.0, 0.0)]
 
+The GeoJSON-like mapping of a geometric object can be obtained using
+:func:`shapely.geometry.mapping`.
+
+.. function:: shapely.geometry.mapping(ob)
+
+   Return a new, independent geometry with coordinates `copied` from the
+   context.
+
+   `New in version 1.2.3`.
+
+For example, using the same `GeoThing` class:
+
+.. sourcecode:: pycon
+
+  >>> from shapely.geometry import mapping
+  >>> thing = GeoThing({"type": "Point", "coordinates": (0.0, 0.0)})
+  >>> m = mapping(thing)
+  >>> m['type']
+  'Point'
+  >>> m['coordinates']
+  (0.0, 0.0)}
+
 Conclusion
 ==========
 

{Shapely-1.2.2 → Shapely-1.2.4}/setup.py

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

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/ctypes_declarations.py

@@ -167,9 +167,6 @@ def prototype(lgeos, geosVersion):
     lgeos.GEOSisValid.restype = ctypes.c_byte
     lgeos.GEOSisValid.argtypes = [ctypes.c_void_p]
 
-    lgeos.GEOSisValidReason.restype = allocated_c_char_p
-    lgeos.GEOSisValidReason.argtypes = [ctypes.c_void_p]
-
     lgeos.GEOSisSimple.restype = ctypes.c_byte
     lgeos.GEOSisSimple.argtypes = [ctypes.c_void_p]
 
@@ -249,6 +246,9 @@ def prototype(lgeos, geosVersion):
         lgeos.GEOSPreparedCovers.restype = ctypes.c_int
         lgeos.GEOSPreparedCovers.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
 
+        lgeos.GEOSisValidReason.restype = allocated_c_char_p
+        lgeos.GEOSisValidReason.argtypes = [ctypes.c_void_p]
+
     # Other, GEOS C API 1.5.0+
     if geosVersion >= (1, 5, 0):
         lgeos.GEOSUnionCascaded.restype = ctypes.c_void_p

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/geometry/__init__.py

@@ -1,7 +1,7 @@
 """Geometry classes and factories
 """
 
-from geo import shape, asShape
+from geo import shape, asShape, mapping
 from point import Point, asPoint
 from linestring import LineString, asLineString
 from polygon import Polygon, asPolygon
@@ -14,7 +14,7 @@ __all__ = [
     'shape', 'asShape', 'Point', 'asPoint', 'LineString', 'asLineString',
     'Polygon', 'asPolygon', 'MultiPoint', 'asMultiPoint',
     'MultiLineString', 'asMultiLineString', 'MultiPolygon', 'asMultiPolygon',
-    'GeometryCollection'
+    'GeometryCollection', 'mapping'
     ]
 
 

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/geometry/base.py

@@ -7,7 +7,7 @@ import warnings
 
 from shapely.coords import CoordinateSequence
 from shapely.geos import lgeos
-from shapely.impl import DefaultImplementation
+from shapely.impl import DefaultImplementation, delegated
 from shapely import wkb, wkt
 
 GEOMETRY_TYPES = [
@@ -94,10 +94,14 @@ class BaseGeometry(object):
     def _is_empty(self):
         return self.__geom__ in [EMPTY, None]
 
+    # a reference to the so/dll proxy to preserve access during clean up
+    _lgeos = lgeos
+
     def empty(self):
+        # TODO: defer cleanup to the implementation. We shouldn't be
+        # explicitly calling a lgeos method here.
         if not (self._owned or self._is_empty):
-            from shapely.geos import lgeos
-            lgeos.GEOSGeom_destroy(self.__geom__)
+            self._lgeos.GEOSGeom_destroy(self.__geom__)
         self.__geom__ = EMPTY
 
     def __del__(self):
@@ -246,6 +250,7 @@ class BaseGeometry(object):
         """Returns the geometric center of the object"""
         return geom_factory(self.impl['centroid'](self))
 
+    @delegated
     def representative_point(self):
         """Returns a point guaranteed to be within the object, cheaply."""
         return geom_factory(self.impl['representative_point'](self))
@@ -295,6 +300,7 @@ class BaseGeometry(object):
             res = resolution
         return geom_factory(self.impl['buffer'](self, distance, res))
 
+    @delegated
     def simplify(self, tolerance, preserve_topology=True):
         """Returns a simplified geometry produced by the Douglas-Puecker 
         algorithm
@@ -415,6 +421,7 @@ class BaseGeometry(object):
     # Linear referencing
     # ------------------
 
+    @delegated
     def project(self, other, normalized=False):
         """Returns the distance along this geometry to a point nearest the 
         specified point
@@ -427,7 +434,8 @@ class BaseGeometry(object):
         else:
             op = self.impl['project']
         return op(self, other)
-
+           
+    @delegated
     def interpolate(self, distance, normalized=False):
         """Return a point at the specified distance along a linear geometry
         
@@ -574,7 +582,6 @@ class HeterogeneousGeometrySequence(GeometrySequence):
         g._owned = True
         return g
 
-
 # Test runner
 def _test():
     import doctest

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/geometry/geo.py

@@ -62,3 +62,7 @@ def asShape(context):
         return MultiPolygonAdapter(ob["coordinates"], context_type='geojson')
     else:
         raise ValueError("Unknown geometry type: %s" % geom_type)
+
+def mapping(ob):
+    """Returns a GeoJSON-like mapping"""
+    return ob.__geo_interface__

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/geos.py

@@ -25,30 +25,38 @@ LOG.addHandler(NullHandler())
 # Find and load the GEOS and C libraries
 # If this ever gets any longer, we'll break it into separate modules
 
+def load_dll(libname, fallbacks=None):
+    lib = find_library(libname)
+    if lib is not None:
+        return CDLL(lib)
+    else:
+        if fallbacks is not None:
+            for name in fallbacks:
+                try:
+                    return CDLL(name)
+                except OSError:
+                    # move on to the next fallback
+                    pass
+        # the end
+        raise OSError(
+            "Could not find library %s or load any of its variants %s" % (
+                libname, fallbacks or []))
+       
 if sys.platform == 'linux2':
-    _lgeos = CDLL(find_library('geos_c'))
-    free = CDLL(find_library('c')).free
+    _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+    free = load_dll('c').free
     free.argtypes = [c_void_p]
     free.restype = None
 
 elif sys.platform == 'darwin':
-    lib = find_library('geos_c')
-    if lib is None:
-        ## try a few more locations
-        lib_paths = [
+    alt_paths = [
             # The Framework build from Kyng Chaos:
             "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
             # macports
             '/opt/local/lib/libgeos_c.dylib',
-        ]
-        for path in lib_paths:
-            if os.path.exists(path):
-                lib = path
-                break
-    if lib is None:
-        raise ImportError("Could not find geos_c library")
-    _lgeos = CDLL(lib)
-    free = CDLL(find_library('c')).free
+    ]
+    _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+    free = load_dll('c').free
     free.argtypes = [c_void_p]
     free.restype = None
 
@@ -58,7 +66,7 @@ elif sys.platform == 'win32':
         original_path = os.environ['PATH']
         os.environ['PATH'] = "%s;%s" % (local_dlls, original_path)
         _lgeos = CDLL("geos.dll")
-    except (ImportError, WindowsError):
+    except (ImportError, WindowsError, OSError):
         raise
     def free(m):
         try:
@@ -68,28 +76,14 @@ elif sys.platform == 'win32':
             pass
 
 elif sys.platform == 'sunos5':
-    # Try the major versioned name first, falling back on the unversioned
-    # name.
-    try:
-        _lgeos = CDLL('libgeos_c.so.1')
-    except (OSError, ImportError):
-        _lgeos = CDLL('libgeos_c.so')
-    except:
-        raise
+    _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
     free = CDLL('libc.so.1').free
     free.argtypes = [c_void_p]
     free.restype = None
 
 else: # other *nix systems
-    # Try the major versioned name first, falling back on the unversioned
-    # name.
-    try:
-        _lgeos = CDLL('libgeos_c.so.1')
-    except (OSError, ImportError):
-        _lgeos = CDLL('libgeos_c.so')
-    except:
-        raise
-    free = CDLL('libc.so.6').free
+    _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+    free = load_dll('c', fallbacks=['libc.so.6']).free
     free.argtypes = [c_void_p]
     free.restype = None
 
@@ -298,6 +292,8 @@ class LGEOS15(LGEOSBase):
               ):
             pred.func.errcheck = errcheck_predicate
 
+        self.GEOSisValidReason.func.errcheck = errcheck_just_free
+        
         self.methods['area'] = self.GEOSArea
         self.methods['boundary'] = self.GEOSBoundary
         self.methods['buffer'] = self.GEOSBuffer
@@ -351,8 +347,6 @@ class LGEOS16LR(LGEOS16):
     def __init__(self, dll):
         super(LGEOS16LR, self).__init__(dll)
 
-        self.GEOSisValidReason.func.errcheck = errcheck_just_free
-        
         self.methods['project'] = self.GEOSProject
         self.methods['project_normalized'] = self.GEOSProjectNormalized
         self.methods['interpolate'] = self.GEOSInterpolate

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/impl.py

@@ -11,6 +11,8 @@ This is layer number 2 from the list below.
 Shapely 1.2 includes a GEOS backend and it is the default.
 """
 
+from functools import wraps
+
 from shapely.coords import BoundsOp
 from shapely.geos import lgeos
 from shapely.linref import ProjectOp, InterpolateOp
@@ -18,9 +20,33 @@ from shapely.predicates import BinaryPredicate, UnaryPredicate
 from shapely.topology import BinaryRealProperty, BinaryTopologicalOp
 from shapely.topology import UnaryRealProperty, UnaryTopologicalOp
 
+def delegated(func):
+    """A delegated method raises AttributeError in the absence of backend 
+    support."""
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except KeyError:
+            raise AttributeError, "Method '%s' is not supported by %s" % (
+                func.__name__, repr(args[0].impl))
+    return wrapper
 
 # Map geometry methods to their GEOS delegates
 
+class BaseImpl(object):
+    def __init__(self, values):
+        self.map = dict(values)
+    def update(self, values):
+        self.map.update(values)
+    def __getitem__(self, key):
+        return self.map[key]
+
+class GEOSImpl(BaseImpl):
+    def __repr__(self):
+        return '<GEOSImpl object: GEOS C API version %s>' % (
+            lgeos.geos_capi_version,)
+
 IMPL14 = {
     'area': (UnaryRealProperty, 'area'),
     'distance': (BinaryRealProperty, 'distance'),
@@ -81,7 +107,7 @@ IMPL16LR = {
 def impl_items(defs):
     return [(k, v[0](v[1])) for k, v in defs.items()]
 
-imp = dict(impl_items(IMPL14))
+imp = GEOSImpl(dict(impl_items(IMPL14)))
 if lgeos.geos_capi_version >= (1, 5, 0):
     imp.update(impl_items(IMPL15))
 if lgeos.geos_capi_version >= (1, 6, 0):

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/prepared.py

@@ -3,7 +3,7 @@ Support for GEOS prepared geometry operations.
 """
 
 from shapely.geos import lgeos
-from shapely.impl import DefaultImplementation
+from shapely.impl import DefaultImplementation, delegated
 
 
 class PreparedGeometry(object):
@@ -34,16 +34,20 @@ class PreparedGeometry(object):
     @property
     def _geom(self):
         return self.__geom__
-    
+   
+    @delegated
     def intersects(self, other):
         return bool(self.impl['prepared_intersects'](self, other))
 
+    @delegated
     def contains(self, other):
         return bool(self.impl['prepared_contains'](self, other))
 
+    @delegated
     def contains_properly(self, other):
         return bool(self.impl['prepared_contains_properly'](self, other))
 
+    @delegated
     def covers(self, other):
         return bool(self.impl['prepared_covers'](self, other))
 

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/tests/__init__.py

@@ -2,6 +2,7 @@ from unittest import TestSuite
 
 import test_doctests, test_prepared, test_equality, test_geomseq, test_xy
 import test_collection, test_emptiness, test_singularity, test_validation
+import test_mapping, test_delegated, test_dlls
 
 def test_suite():
     suite = TestSuite()
@@ -14,5 +15,8 @@ def test_suite():
     suite.addTest(test_collection.test_suite())
     suite.addTest(test_singularity.test_suite())
     suite.addTest(test_validation.test_suite())
+    suite.addTest(test_mapping.test_suite())
+    suite.addTest(test_delegated.test_suite())
+    suite.addTest(test_dlls.test_suite())
     return suite
 

Shapely-1.2.4/shapely/tests/test_delegated.py

@@ -0,0 +1,22 @@
+import unittest
+from shapely.geometry import Point
+from shapely.impl import BaseImpl
+from shapely.geometry.base import delegated
+
+class Geometry(object):
+    impl = BaseImpl({})
+    @property
+    @delegated
+    def foo(self):
+        return self.impl['foo']()
+
+class WrapperTestCase(unittest.TestCase):
+    """When the backend has no support for a method, we get an AttributeError"""
+    def test_delegated(self):
+        self.assertRaises(AttributeError, getattr, Geometry(), 'foo')
+    def test_defaultimpl(self):
+        del Point.impl.map['project']
+        self.assertRaises(AttributeError, Point(0, 0).project, 1.0)
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(WrapperTestCase)

Shapely-1.2.4/shapely/tests/test_dlls.py

@@ -0,0 +1,14 @@
+import os
+import sys
+import unittest
+
+from shapely.geos import load_dll
+
+class LoadingTestCase(unittest.TestCase):
+    def test_load(self):
+        self.assertRaises(OSError, load_dll, 'geosh_c')
+    def test_fallbacks(self):
+        a = load_dll('geosh_c', fallbacks=['/opt/local/lib/libgeos_c.dylib'])
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(LoadingTestCase)

Shapely-1.2.4/shapely/tests/test_mapping.py

@@ -0,0 +1,11 @@
+import unittest
+from shapely.geometry import Point, mapping
+
+class MappingTestCase(unittest.TestCase):
+    def test_point(self):
+        m = mapping(Point(0, 0))
+        self.failUnlessEqual(m['type'], 'Point')
+        self.failUnlessEqual(m['coordinates'], (0.0, 0.0))
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(MappingTestCase)

{Shapely-1.2.2 → Shapely-1.2.4}/shapely/validation.py

@@ -1,4 +1,4 @@
-#
+# TODO: allow for implementations using other than GEOS
 
 from shapely.geos import lgeos