shapely 1.3.1__tar.gz → 1.3.2__tar.gz

{Shapely-1.3.1 → Shapely-1.3.2}/CHANGES.txt

@@ -1,6 +1,10 @@
 Changes
 =======
 
+1.3.2 (2014-05-13)
+------------------
+- Let LineString() take a sequence of Points (#130).
+
 1.3.1 (2014-04-22)
 ------------------
 - More reliable proxy cleanup on exit (#106).

{Shapely-1.3.1 → Shapely-1.3.2}/CREDITS.txt

@@ -20,6 +20,7 @@ Patches contributed by:
 * Kelsey Jordahl (https://github.com/kjordahl)
 * Fr |eaigue| d |eaigue| ric Junod
 * Thomas Kluyver (https://github.com/takluyver)
+* William Kyngesburye (https://github.com/kyngchaos)
 * Eric Lemoine
 * Naveen Michaud-Agrawal (https://github.com/nmichaud)
 * psagers https://github.com/psagers

{Shapely-1.3.1/Shapely.egg-info → Shapely-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.1
+Version: 1.3.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -149,7 +149,7 @@ Description: =======
         
         Bugs may be reported at https://github.com/Toblerity/Shapely.
         
-        .. include:: ../CREDITS.txt
+        
         
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
@@ -181,6 +181,7 @@ Description: =======
         * Kelsey Jordahl (https://github.com/kjordahl)
         * Fr |eaigue| d |eaigue| ric Junod
         * Thomas Kluyver (https://github.com/takluyver)
+        * William Kyngesburye (https://github.com/kyngchaos)
         * Eric Lemoine
         * Naveen Michaud-Agrawal (https://github.com/nmichaud)
         * psagers https://github.com/psagers
@@ -212,6 +213,10 @@ Description: =======
         Changes
         =======
         
+        1.3.2 (2014-05-13)
+        ------------------
+        - Let LineString() take a sequence of Points (#130).
+        
         1.3.1 (2014-04-22)
         ------------------
         - More reliable proxy cleanup on exit (#106).

{Shapely-1.3.1 → Shapely-1.3.2}/README.rst

@@ -141,7 +141,7 @@ http://lists.gispython.org/mailman/listinfo/community.
 
 Bugs may be reported at https://github.com/Toblerity/Shapely.
 
-.. include:: ../CREDITS.txt
+.. include:: CREDITS.txt
 
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.org

{Shapely-1.3.1 → Shapely-1.3.2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.1
+Version: 1.3.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -149,7 +149,7 @@ Description: =======
         
         Bugs may be reported at https://github.com/Toblerity/Shapely.
         
-        .. include:: ../CREDITS.txt
+        
         
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
@@ -181,6 +181,7 @@ Description: =======
         * Kelsey Jordahl (https://github.com/kjordahl)
         * Fr |eaigue| d |eaigue| ric Junod
         * Thomas Kluyver (https://github.com/takluyver)
+        * William Kyngesburye (https://github.com/kyngchaos)
         * Eric Lemoine
         * Naveen Michaud-Agrawal (https://github.com/nmichaud)
         * psagers https://github.com/psagers
@@ -212,6 +213,10 @@ Description: =======
         Changes
         =======
         
+        1.3.2 (2014-05-13)
+        ------------------
+        - Let LineString() take a sequence of Points (#130).
+        
         1.3.1 (2014-04-22)
         ------------------
         - More reliable proxy cleanup on exit (#106).

Shapely-1.3.2/VERSION.txt

@@ -0,0 +1 @@
+1.3.2

Shapely-1.3.2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.2"

{Shapely-1.3.1 → Shapely-1.3.2}/shapely/geometry/linestring.py

@@ -12,6 +12,7 @@ from shapely.coords import required
 from shapely.geos import lgeos, TopologicalError
 from shapely.geometry.base import BaseGeometry, geom_factory, JOIN_STYLE
 from shapely.geometry.proxy import CachingGeometryProxy
+from shapely.geometry.point import Point
 
 __all__ = ['LineString', 'asLineString']
 
@@ -221,8 +222,15 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         if m < 2:
             raise ValueError(
                 "LineStrings must have at least 2 coordinate tuples")
+
+        def _coords(o):
+            if isinstance(o, Point):
+                return o.coords[0]
+            else:
+                return o
+
         try:
-            n = len(ob[0])
+            n = len(_coords(ob[0]))
         except TypeError:
             raise ValueError(
                 "Input %s is the wrong shape for a LineString" % str(ob))
@@ -240,7 +248,7 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
 
         # add to coordinate sequence
         for i in range(m):
-            coords = ob[i]
+            coords = _coords(ob[i])
             # Because of a bug in the GEOS C API,
             # always set X before Y
             lgeos.GEOSCoordSeq_setX(cs, i, coords[0])

{Shapely-1.3.1 → Shapely-1.3.2}/shapely/speedups/_speedups.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 0.20 on Tue Apr 22 10:32:38 2014 */
+/* Generated by Cython 0.20 on Tue May 13 08:23:58 2014 */
 
 #define PY_SSIZE_T_CLEAN
 #ifndef CYTHON_USE_PYLONG_INTERNALS

{Shapely-1.3.1 → Shapely-1.3.2}/shapely/tests/test_linestring.py

@@ -1,5 +1,5 @@
 from . import unittest, numpy
-from shapely.geometry import LineString, asLineString
+from shapely.geometry import LineString, asLineString, Point
 
 
 class LineStringTestCase(unittest.TestCase):
@@ -11,6 +11,16 @@ class LineStringTestCase(unittest.TestCase):
         self.assertEqual(len(line.coords), 2)
         self.assertEqual(line.coords[:], [(1.0, 2.0), (3.0, 4.0)])
 
+        # From Points
+        line2 = LineString((Point(1.0, 2.0), Point(3.0, 4.0)))
+        self.assertEqual(len(line2.coords), 2)
+        self.assertEqual(line2.coords[:], [(1.0, 2.0), (3.0, 4.0)])
+
+        # From mix of tuples and Points
+        line3 = LineString((Point(1.0, 2.0), (2.0, 3.0), Point(3.0, 4.0)))
+        self.assertEqual(len(line3.coords), 3)
+        self.assertEqual(line3.coords[:], [(1.0, 2.0), (2.0, 3.0), (3.0, 4.0)])
+
         # From lines
         copy = LineString(line)
         self.assertEqual(len(copy.coords), 2)

Shapely-1.3.1/VERSION.txt

@@ -1 +0,0 @@
-1.3.1

Shapely-1.3.1/shapely/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.3.1"