shapely 1.2.5__tar.gz → 1.2.6__tar.gz

{Shapely-1.2.5 → Shapely-1.2.6}/CHANGES.txt

@@ -1,4 +1,10 @@
-All tickets are children of http://trac.gispython.org/lab/ticket.
+
+1.2.6 (2010-10-21)
+------------------
+- The geoms property of an empty collection yields [] instead of a ValueError
+  (#3).
+- The coords and geometry type sproperties have the same behavior as above.
+- Ensure that z values carry through into products of operations (#4).
 
 1.2.5 (2010-09-19)
 ------------------
@@ -9,8 +15,8 @@ All tickets are children of http://trac.gispython.org/lab/ticket.
 ------------------
 - 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.
+- Add geos_c DLL loading support for linux platforms where find_library doesn't
+  work.
 
 1.2.3 (2010-08-17)
 ------------------

{Shapely-1.2.5/Shapely.egg-info → Shapely-1.2.6}/PKG-INFO

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

{Shapely-1.2.5 → Shapely-1.2.6/Shapely.egg-info}/PKG-INFO

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

{Shapely-1.2.5 → Shapely-1.2.6}/Shapely.egg-info/SOURCES.txt

@@ -54,7 +54,6 @@ shapely/tests/binascii_hex.txt
 shapely/tests/cascaded_union.txt
 shapely/tests/dimensions.txt
 shapely/tests/invalid_intersection.txt
-shapely/tests/linear-referencing.txt
 shapely/tests/linemerge.txt
 shapely/tests/polygonize.txt
 shapely/tests/test_collection.py
@@ -64,8 +63,10 @@ shapely/tests/test_doctests.py
 shapely/tests/test_emptiness.py
 shapely/tests/test_equality.py
 shapely/tests/test_geomseq.py
+shapely/tests/test_linear_referencing.py
 shapely/tests/test_mapping.py
 shapely/tests/test_prepared.py
+shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py
 shapely/tests/test_validation.py
 shapely/tests/test_xy.py

{Shapely-1.2.5 → Shapely-1.2.6}/docs/manual.txt

@@ -1,10 +1,10 @@
-=====================================
-The Shapely 1.2 User Manual (Preview)
-=====================================
+=======================
+The Shapely User Manual
+=======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.3
-:Date: 19 August 2010
+:Revision: 1.2.6
+:Date: 17 October 2010
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -56,7 +56,7 @@ multitude of State Plane projections, and Shapely doesn't burden you with them.
 The third premise is that Python idioms trump GIS (or Java, in this case, since
 the GEOS library is derived from JTS, a Java project) idioms. 
 
-If you enjoy and profit from Python idioms, appreciate packages that do one
+If you enjoy and profit from idiommatic Python, appreciate packages that do one
 thing well, and agree that a spatially enabled RDBMS is often enough the wrong
 tool for your computational geometry job, Shapely might be for you.
 
@@ -687,6 +687,8 @@ by empty features.
   0.0
   >>> line.bounds
   ()
+  >>> line.coords
+  []
 
 The coordinates of a empty feature can be set, after which the geometry is no
 longer empty.

{Shapely-1.2.5 → Shapely-1.2.6}/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.5',
+    version             = '1.2.6',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/geometry/base.py

@@ -42,7 +42,10 @@ def geom_factory(g, parent=None):
     ob.__class__ = getattr(mod, geom_type)
     ob.__geom__ = g
     ob.__p__ = parent
-    ob._ndim = 2 # callers should be all from 2D worlds
+    if lgeos.methods['has_z'](g):
+        ob._ndim = 3
+    else:
+        ob._ndim = 2
     return ob
 
 def exceptNull(func):
@@ -159,9 +162,10 @@ class BaseGeometry(object):
     # Coordinate access
     # -----------------
 
-    @exceptNull
     def _get_coords(self):
         """Access to geometry's coordinates (CoordinateSequence)"""
+        if self.is_empty:
+            return []
         return CoordinateSequence(self)
 
     def _set_coords(self, ob):
@@ -185,7 +189,6 @@ class BaseGeometry(object):
     # Type of geometry and its representations
     # ----------------------------------------
 
-    @exceptNull
     def geometryType(self):
         return geometry_type_name(self._geom)
     
@@ -480,8 +483,9 @@ class BaseMultipartGeometry(BaseGeometry):
         "Multi-part geometries do not provide a coordinate sequence")
 
     @property
-    @exceptNull
     def geoms(self):
+        if self.is_empty:
+            return []
         return GeometrySequence(self, self.shape_factory)
 
     def __iter__(self):

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/geometry/collection.py

@@ -2,7 +2,7 @@
 """
 
 from shapely.geometry.base import BaseMultipartGeometry
-from shapely.geometry.base import HeterogeneousGeometrySequence, exceptNull
+from shapely.geometry.base import HeterogeneousGeometrySequence
 
 
 class GeometryCollection(BaseMultipartGeometry):
@@ -26,8 +26,9 @@ class GeometryCollection(BaseMultipartGeometry):
         return dict(type='GeometryCollection', geometries=geometries)
 
     @property
-    @exceptNull
     def geoms(self):
+        if self.is_empty:
+            return []
         return HeterogeneousGeometrySequence(self)
 
 

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/geometry/polygon.py

@@ -5,7 +5,7 @@ from ctypes import c_double, c_void_p, cast, POINTER
 from ctypes import ArgumentError
 import weakref
 from shapely.geos import lgeos
-from shapely.geometry.base import BaseGeometry, exceptNull
+from shapely.geometry.base import BaseGeometry
 from shapely.geometry.linestring import LineString, LineStringAdapter
 from shapely.geometry.proxy import PolygonProxy
 
@@ -198,9 +198,10 @@ class Polygon(BaseGeometry):
             self._geom, self._ndim = geos_polygon_from_py(shell, holes)
 
     @property
-    @exceptNull
     def exterior(self):
-        if self._exterior is None or self._exterior() is None:
+        if self.is_empty:
+            return None
+        elif self._exterior is None or self._exterior() is None:
             g = lgeos.GEOSGetExteriorRing(self._geom)
             ring = LinearRing()
             ring.__geom__ = g
@@ -211,8 +212,9 @@ class Polygon(BaseGeometry):
         return self._exterior()
 
     @property
-    @exceptNull
     def interiors(self):
+        if self.is_empty:
+            return []
         return InteriorRingSequence(self)
 
     @property

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/tests/__init__.py

@@ -2,7 +2,8 @@ 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
+import test_mapping, test_delegated, test_dlls, test_linear_referencing
+import test_products_z
 
 def test_suite():
     suite = TestSuite()
@@ -18,5 +19,7 @@ def test_suite():
     suite.addTest(test_mapping.test_suite())
     suite.addTest(test_delegated.test_suite())
     suite.addTest(test_dlls.test_suite())
+    suite.addTest(test_linear_referencing.test_suite())
+    suite.addTest(test_products_z.test_suite())
     return suite
 

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/tests/test_collection.py

@@ -5,6 +5,7 @@ class CollectionTestCase(unittest.TestCase):
     def test_array_interface(self):
         m = GeometryCollection()
         self.failUnlessEqual(len(m), 0)
+        self.failUnlessEqual(m.geoms, [])
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromTestCase(CollectionTestCase)

{Shapely-1.2.5 → Shapely-1.2.6}/shapely/tests/test_delegated.py

@@ -15,8 +15,12 @@ class WrapperTestCase(unittest.TestCase):
     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)
+        project_impl = Point.impl.map.pop('project', None)
+        try:
+            self.assertRaises(AttributeError, Point(0, 0).project, 1.0)
+        finally:
+            if project_impl is not None:
+                Point.impl.map['project'] = project_impl
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromTestCase(WrapperTestCase)

Shapely-1.2.6/shapely/tests/test_linear_referencing.py

@@ -0,0 +1,67 @@
+import unittest
+from shapely.geometry import Point, LineString, MultiLineString
+
+class LinearReferencingTestCase(unittest.TestCase):
+    def setUp(self):
+        self.point = Point(1, 1)
+        self.line1 = LineString(([0, 0], [2, 0]))
+        self.line2 = LineString(([3, 0], [3, 6]))
+        self.multiline = MultiLineString([
+            list(self.line1.coords), list(self.line2.coords)
+        ]) 
+
+    def test_line1_project(self):
+        self.assertEqual(self.line1.project(self.point), 1.0)
+        self.assertEqual(self.line1.project(self.point, normalized=True), 0.5)
+
+    def test_line2_project(self):
+        self.assertEqual(self.line2.project(self.point), 1.0)
+        self.assertAlmostEqual(self.line2.project(self.point, normalized=True),
+            0.16666666666, 8)
+
+    def test_multiline_project(self):
+        self.assertEqual(self.multiline.project(self.point), 1.0)
+        self.assertEqual(self.multiline.project(self.point, normalized=True),
+            0.125)
+
+    def test_not_supported_project(self):
+        self.assertRaises(TypeError, self.point.buffer(1.0).project,
+            self.point)
+
+    def test_not_on_line_project(self):
+        # Points that aren't on the line project to 0.
+        self.assertEqual(self.line1.project(Point(-10,-10)), 0.0)
+
+    def test_line1_interpolate(self):
+        self.failUnless(self.line1.interpolate(0.5).equals(Point(0.5, 0.0)))
+        self.failUnless(
+            self.line1.interpolate(0.5, normalized=True).equals(
+                Point(1.0, 0.0)))
+
+    def test_line2_interpolate(self):
+        self.failUnless(self.line2.interpolate(0.5).equals(Point(3.0, 0.5)))
+        self.failUnless(
+            self.line2.interpolate(0.5, normalized=True).equals(
+                Point(3.0, 3.0)))
+
+    def test_multiline_interpolate(self):
+        self.failUnless(self.multiline.interpolate(0.5).equals(
+            Point(0.5, 0.0)))
+        self.failUnless(
+            self.multiline.interpolate(0.5, normalized=True).equals(
+                Point(3.0, 2.0)))
+
+    def test_line_ends_interpolate(self):
+        # Distances greater than length of the line or less than
+        # zero yield the line's ends.
+        self.failUnless(self.line1.interpolate(-1000).equals(Point(0.0, 0.0)))
+        self.failUnless(self.line1.interpolate(1000).equals(Point(2.0, 0.0)))
+
+def test_suite():
+    try:
+        LineString(([0, 0], [2, 0])).project(Point(0, 0))
+    except AttributeError:
+        return lambda x: None
+    return unittest.TestLoader().loadTestsFromTestCase(
+                                  LinearReferencingTestCase
+                                  )

Shapely-1.2.6/shapely/tests/test_products_z.py

@@ -0,0 +1,14 @@
+import unittest
+from shapely.geometry import LineString
+
+class ProductZTestCase(unittest.TestCase):
+    def test_line_intersection(self):
+        line1 = LineString([(0,0,0), (1,1,1)])
+        line2 = LineString([(0,1,1), (1,0,0)])
+        interxn = line1.intersection(line2)
+        self.failUnless(interxn.has_z)
+        self.failUnless(interxn._ndim == 3)
+        self.failUnless(0.0 <= interxn.z <= 1.0)
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(ProductZTestCase)

Shapely-1.2.5/shapely/tests/linear-referencing.txt

@@ -1,58 +0,0 @@
-First, tests of projection
-
-  >>> from shapely.geometry import Point, LineString, MultiLineString
-  
-  >>> point = Point(1, 1)
-  >>> line1 = LineString(([0, 0], [2, 0]))
-  >>> line1.project(point)
-  1.0
-  >>> line1.project(point, normalized=True)
-  0.5
-
-  >>> line2 = LineString(([3, 0], [3, 6]))
-  >>> line2.project(point)
-  1.0
-  >>> line2.project(point, normalized=True)
-  0.16666666666666666
-
-  >>> multiline = MultiLineString([list(line1.coords), list(line2.coords)]) 
-  >>> multiline.project(point)
-  1.0
-  >>> multiline.project(point, normalized=True)
-  0.125
-
-  >>> point.buffer(1.0).project(point) # doctest: +ELLIPSIS
-  Traceback (most recent call last):
-  ...
-  TypeError: Only linear types support this operation
-
-Points that aren't on the line project to 0.
-
-  >>> line1.project(Point(-10,-10))
-  0.0
-
-Now tests of interpolation
-
-  >>> line1.interpolate(0.5).wkt
-  'POINT (0.5000000000000000 0.0000000000000000)'
-  >>> line1.interpolate(0.5, normalized=True).wkt
-  'POINT (1.0000000000000000 0.0000000000000000)'
-
-  >>> line2.interpolate(0.5).wkt
-  'POINT (3.0000000000000000 0.5000000000000000)'
-  >>> line2.interpolate(0.5, normalized=True).wkt
-  'POINT (3.0000000000000000 3.0000000000000000)'
-
-  >>> multiline.interpolate(0.5).wkt
-  'POINT (0.5000000000000000 0.0000000000000000)'
-  >>> multiline.interpolate(0.5, normalized=True).wkt
-  'POINT (3.0000000000000000 2.0000000000000000)'
-
-Distances greater than length of the line or less than zero yield the line's
-ends.
-
-  >>> line1.interpolate(-1000.0).wkt
-  'POINT (0.0000000000000000 0.0000000000000000)'
-  >>> line1.interpolate(1000.0).wkt
-  'POINT (2.0000000000000000 0.0000000000000000)'
-