shapely 1.2b5__tar.gz → 1.2b6__tar.gz

{Shapely-1.2b5 → Shapely-1.2b6}/CHANGES.txt

@@ -1,5 +1,9 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.2b6 (2010-04-13)
+------------------
+- Broken GeometryCollection fixed.
+
 1.2b5 (2010-04-09)
 ------------------
 - Objects can be constructed from others of the same type, thereby making

{Shapely-1.2b5 → Shapely-1.2b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b5
+Version: 1.2b6
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -10,9 +10,9 @@ Description:
         Shapely
         =======
         
-        .. image:: http://gispython.org/images/shapely-med.png
-        :width: 640
-        :height: 320
+        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+        :width: 800
+        :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometries. It is not concerned with data formats or coordinate

{Shapely-1.2b5 → Shapely-1.2b6}/README.txt

@@ -2,9 +2,9 @@
 Shapely
 =======
 
-.. image:: http://gispython.org/images/shapely-med.png
-   :width: 640
-   :height: 320
+.. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+   :width: 800
+   :height: 400
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
 planar geometries. It is not concerned with data formats or coordinate

{Shapely-1.2b5 → Shapely-1.2b6}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b5
+Version: 1.2b6
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -10,9 +10,9 @@ Description:
         Shapely
         =======
         
-        .. image:: http://gispython.org/images/shapely-med.png
-        :width: 640
-        :height: 320
+        .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
+        :width: 800
+        :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometries. It is not concerned with data formats or coordinate

Shapely-1.2b6/examples/dissolve.py

@@ -0,0 +1,53 @@
+# dissolve.py
+#
+# Demonstrate how Shapely can be used to build up a collection of patches by 
+# dissolving circular regions and how Shapely supports plotting of the results.
+
+from functools import partial
+import random
+
+import pylab
+
+from shapely.geometry import Point
+from shapely.ops import cascaded_union
+
+# Use a partial function to make 100 points uniformly distributed in a 40x40 
+# box centered on 0,0.
+r = partial(random.uniform, -20.0, 20.0)
+points = [Point(r(), r()) for i in range(100)]
+
+# Buffer the points, producing 100 polygon spots
+spots = [p.buffer(2.5) for p in points]
+
+# Perform a cascaded union of the polygon spots, dissolving them into a 
+# collection of polygon patches
+patches = cascaded_union(spots)
+
+if __name__ == "__main__":
+    # Illustrate the results using matplotlib's pylab interface
+    pylab.figure(num=None, figsize=(4, 4), dpi=180)
+    
+    for patch in patches.geoms:
+        assert patch.geom_type in ['Polygon']
+        assert patch.is_valid
+    
+        # Fill and outline each patch
+        x, y = patch.exterior.xy
+        pylab.fill(x, y, color='#cccccc', aa=True) 
+        pylab.plot(x, y, color='#666666', aa=True, lw=1.0)
+    
+        # Do the same for the holes of the patch
+        for hole in patch.interiors:
+            x, y = hole.xy
+            pylab.fill(x, y, color='#ffffff', aa=True) 
+            pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
+    
+    # Plot the original points
+    pylab.plot([p.x for p in points], [p.y for p in points], 'b,', alpha=0.75)
+    
+    # Write the number of patches and the total patch area to the figure
+    pylab.text(-25, 25, 
+        "Patches: %d, total area: %.2f" % (len(patches.geoms), patches.area))
+    
+    pylab.savefig('dissolve.png')
+    

Shapely-1.2b6/examples/intersect.py

@@ -0,0 +1,81 @@
+# intersect.py
+#
+# Demonstrate how Shapely can be used to analyze and plot the intersection of
+# a trajectory and regions in space.
+
+from functools import partial
+import random
+
+import pylab
+
+from shapely.geometry import LineString, Point
+from shapely.ops import cascaded_union
+
+# Build patches as in dissolved.py
+r = partial(random.uniform, -20.0, 20.0)
+points = [Point(r(), r()) for i in range(100)]
+spots = [p.buffer(2.5) for p in points]
+patches = cascaded_union(spots)
+
+# Represent the following geolocation parameters
+#
+# initial position: -25, -25
+# heading: 45.0
+# speed: 50*sqrt(2)
+#
+# as a line
+vector = LineString(((-25.0, -25.0), (25.0, 25.0)))
+
+# Find intercepted and missed patches. List the former so we can count them
+# later
+intercepts = [patch for patch in patches.geoms if vector.intersects(patch)]
+misses = (patch for patch in patches.geoms if not vector.intersects(patch))
+
+# Plot the intersection
+intersection = vector.intersection(patches)
+assert intersection.geom_type in ['MultiLineString']
+
+if __name__ == "__main__":
+    # Illustrate the results using matplotlib's pylab interface
+    pylab.figure(num=None, figsize=(4, 4), dpi=180)
+    
+    # Plot the misses
+    for spot in misses:
+        x, y = spot.exterior.xy
+        pylab.fill(x, y, color='#cccccc', aa=True) 
+        pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
+    
+        # Do the same for the holes of the patch
+        for hole in spot.interiors:
+            x, y = hole.xy
+            pylab.fill(x, y, color='#ffffff', aa=True) 
+            pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
+    
+    # Plot the intercepts
+    for spot in intercepts:
+        x, y = spot.exterior.xy
+        pylab.fill(x, y, color='red', alpha=0.25, aa=True) 
+        pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
+    
+        # Do the same for the holes of the patch
+        for hole in spot.interiors:
+            x, y = hole.xy
+            pylab.fill(x, y, color='#ffffff', aa=True) 
+            pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
+    
+    # Draw the projected trajectory
+    pylab.arrow(-25, -25, 50, 50, color='#999999', aa=True,
+        head_width=1.0, head_length=1.0)
+    
+    for segment in intersection.geoms:
+        x, y = segment.xy
+        pylab.plot(x, y, color='red', aa=True, lw=1.5)
+    
+    # Write the number of patches and the total patch area to the figure
+    pylab.text(-28, 25, 
+        "Patches: %d/%d (%d), total length: %.1f" \
+         % (len(intercepts), len(patches.geoms), 
+            len(intersection.geoms), intersection.length))
+    
+    pylab.savefig('intersect.png')
+    

{Shapely-1.2b5 → Shapely-1.2b6}/setup.py

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

{Shapely-1.2b5 → Shapely-1.2b6}/shapely/geometry/base.py

@@ -460,6 +460,18 @@ class BaseMultipartGeometry(BaseGeometry):
         else:
             return iter([])
 
+    def __len__(self):
+        if not self.is_empty:
+            return len(self.geoms)
+        else:
+            return 0
+
+    def __getitem__(self, index):
+        if not self.is_empty:
+            return self.geoms[index]
+        else:
+            return ()[index]
+
 
 class GeometrySequence(object):
     """

{Shapely-1.2b5 → Shapely-1.2b6}/shapely/geometry/collection.py

@@ -16,7 +16,7 @@ class GeometryCollection(BaseMultipartGeometry):
     """
 
     def __init__(self):
-        BaseMultiPartGeometry.__init__(self)
+        BaseMultipartGeometry.__init__(self)
 
     @property
     def __geo_interface__(self):

{Shapely-1.2b5 → Shapely-1.2b6}/shapely/tests/__init__.py

@@ -1,6 +1,7 @@
 from unittest import TestSuite
 
 import test_doctests, test_prepared, test_equality, test_geomseq, test_xy
+import test_collection
 
 def test_suite():
     suite = TestSuite()
@@ -9,5 +10,6 @@ def test_suite():
     suite.addTest(test_equality.test_suite())
     suite.addTest(test_geomseq.test_suite())
     suite.addTest(test_xy.test_suite())
+    suite.addTest(test_collection.test_suite())
     return suite
 

Shapely-1.2b5/examples/dissolve.py

@@ -1,52 +0,0 @@
-# dissolve.py
-#
-# Demonstrate how Shapely can be used to build up a collection of patches by 
-# dissolving circular regions and how Shapely supports plotting of the results.
-
-from functools import partial
-import random
-
-import pylab
-
-from shapely.geometry import Point
-from shapely.ops import cascaded_union
-
-# Use a partial function to make 100 points uniformly distributed in a 40x40 
-# box centered on 0,0.
-r = partial(random.uniform, -20.0, 20.0)
-points = [Point(r(), r()) for i in range(100)]
-
-# Buffer the points, producing 100 polygon spots
-spots = [p.buffer(2.5) for p in points]
-
-# Perform a cascaded union of the polygon spots, dissolving them into a 
-# collection of polygon patches
-patches = cascaded_union(spots)
-
-# Illustrate the results using matplotlib's pylab interface
-pylab.figure(num=None, figsize=(4, 4), dpi=180)
-
-for patch in patches.geoms:
-    assert patch.geom_type in ['Polygon']
-    assert patch.is_valid
-
-    # Fill and outline each patch
-    x, y = patch.exterior.xy
-    pylab.fill(x, y, color='#cccccc', aa=True) 
-    pylab.plot(x, y, color='#666666', aa=True, lw=1.0)
-
-    # Do the same for the holes of the patch
-    for hole in patch.interiors:
-        x, y = hole.xy
-        pylab.fill(x, y, color='#ffffff', aa=True) 
-        pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-
-# Plot the original points
-pylab.plot([p.x for p in points], [p.y for p in points], 'b,', alpha=0.75)
-
-# Write the number of patches and the total patch area to the figure
-pylab.text(-25, 25, 
-    "Patches: %d, total area: %.2f" % (len(patches.geoms), patches.area))
-
-pylab.savefig('dissolve.png')
-

Shapely-1.2b5/examples/intersect.py

@@ -1,80 +0,0 @@
-# intersect.py
-#
-# Demonstrate how Shapely can be used to analyze and plot the intersection of
-# a trajectory and regions in space.
-
-from functools import partial
-import random
-
-import pylab
-
-from shapely.geometry import LineString, Point
-from shapely.ops import cascaded_union
-
-# Build patches as in dissolved.py
-r = partial(random.uniform, -20.0, 20.0)
-points = [Point(r(), r()) for i in range(100)]
-spots = [p.buffer(2.5) for p in points]
-patches = cascaded_union(spots)
-
-# Represent the following geolocation parameters
-#
-# initial position: -25, -25
-# heading: 45.0
-# speed: 50*sqrt(2)
-#
-# as a line
-vector = LineString(((-25.0, -25.0), (25.0, 25.0)))
-
-# Find intercepted and missed patches. List the former so we can count them
-# later
-intercepts = [patch for patch in patches.geoms if vector.intersects(patch)]
-misses = (patch for patch in patches.geoms if not vector.intersects(patch))
-
-# Illustrate the results using matplotlib's pylab interface
-pylab.figure(num=None, figsize=(4, 4), dpi=180)
-
-# Plot the misses
-for spot in misses:
-    x, y = spot.exterior.xy
-    pylab.fill(x, y, color='#cccccc', aa=True) 
-    pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-
-    # Do the same for the holes of the patch
-    for hole in spot.interiors:
-        x, y = hole.xy
-        pylab.fill(x, y, color='#ffffff', aa=True) 
-        pylab.plot(x, y, color='#999999', aa=True, lw=1.0)
-
-# Plot the intercepts
-for spot in intercepts:
-    x, y = spot.exterior.xy
-    pylab.fill(x, y, color='red', alpha=0.25, aa=True) 
-    pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
-
-    # Do the same for the holes of the patch
-    for hole in spot.interiors:
-        x, y = hole.xy
-        pylab.fill(x, y, color='#ffffff', aa=True) 
-        pylab.plot(x, y, color='red', alpha=0.5, aa=True, lw=1.0)
-
-# Draw the projected trajectory
-pylab.arrow(-25, -25, 50, 50, color='#999999', aa=True,
-    head_width=1.0, head_length=1.0)
-
-# Plot the intersection
-intersection = vector.intersection(patches)
-assert intersection.geom_type in ['MultiLineString']
-
-for segment in intersection.geoms:
-    x, y = segment.xy
-    pylab.plot(x, y, color='red', aa=True, lw=1.5)
-
-# Write the number of patches and the total patch area to the figure
-pylab.text(-28, 25, 
-    "Patches: %d/%d (%d), total length: %.1f" \
-     % (len(intercepts), len(patches.geoms), 
-        len(intersection.geoms), intersection.length))
-
-pylab.savefig('intersect.png')
-