shapely 1.2.2__tar.gz → 1.2.3__tar.gz

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

@@ -1,5 +1,10 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.2
+Version: 1.2.3
 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.3}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.2
+Version: 1.2.3
 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.3}/Shapely.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ 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.3}/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.2
+:Date: 10 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,26 @@ 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.
+
+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.3}/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.2
+:Date: 10 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,26 @@ 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.
+
+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.3}/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.3',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',

{Shapely-1.2.2 → Shapely-1.2.3}/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.3}/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.3}/shapely/geometry/base.py

@@ -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):
@@ -574,7 +578,6 @@ class HeterogeneousGeometrySequence(GeometrySequence):
         g._owned = True
         return g
 
-
 # Test runner
 def _test():
     import doctest

{Shapely-1.2.2 → Shapely-1.2.3}/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.3}/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
 
 def test_suite():
     suite = TestSuite()
@@ -14,5 +15,6 @@ 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())
     return suite
 

Shapely-1.2.3/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.3}/shapely/validation.py

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

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

@@ -298,6 +298,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 +353,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