shapely 1.6b1__tar.gz → 1.6b2__tar.gz

{Shapely-1.6b1 → Shapely-1.6b2}/CHANGES.txt

@@ -1,6 +1,13 @@
 Changes
 =======
 
+1.6b2 (2016-12-12)
+------------------
+
+New features:
+
+- Add support for GeometryCollection to shape and asShape functions (#422).
+
 1.6b1 (2016-12-12)
 ------------------
 

{Shapely-1.6b1/Shapely.egg-info → Shapely-1.6b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b1
+Version: 1.6b2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -13,6 +13,7 @@ Description: =======
         .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
            :target: https://travis-ci.org/Toblerity/Shapely
         
+        .. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
            :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
         
         Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -40,7 +41,7 @@ Description: =======
         * Python >=2.6 (including Python 3.x)
         * GEOS >=3.3 
         
-        Installing Shapely (1.6b1)
+        Installing Shapely (1.6b2)
         ==========================
         
         Windows users have two good installation options: the wheels at
@@ -53,13 +54,13 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install shapely==1.6b1
+            $ pip install shapely==1.6b2
         
         A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ pip install shapely[vectorized]==1.6b1
+            $ pip install shapely[vectorized]==1.6b2
         
         If you want to build Shapely from source for compatibility with
         other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -70,8 +71,8 @@ Description: =======
             $ pip install shapely --no-binary shapely
         
         Binary wheels are also available for Linux. To get them, use `pip shapely
-        shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-        shapely==1.6b1`.
+        shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+        shapely==1.6b2`.
         
         In other situations, install `geos_c` libs and headers by any means 
         (for example, `brew install geos` on OS X or
@@ -90,8 +91,9 @@ Description: =======
         .. code-block:: console
         
             $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-        Shapely is also provided by popular Python distributions like Canopy (Enthought)
-        and Anaconda (Continuum Analytics).
+        
+        Shapely is also provided by popular Python distributions like Canopy
+        (Enthought) and Anaconda (Continuum Analytics).
         
         Usage
         =====
@@ -237,6 +239,13 @@ Description: =======
         Changes
         =======
         
+        1.6b2 (2016-12-12)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
         1.6b1 (2016-12-12)
         ------------------
         

{Shapely-1.6b1 → Shapely-1.6b2}/README.rst

@@ -5,6 +5,7 @@ Shapely
 .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
    :target: https://travis-ci.org/Toblerity/Shapely
 
+.. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
    :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
 
 Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -32,7 +33,7 @@ Shapely 1.6.x requires
 * Python >=2.6 (including Python 3.x)
 * GEOS >=3.3 
 
-Installing Shapely (1.6b1)
+Installing Shapely (1.6b2)
 ==========================
 
 Windows users have two good installation options: the wheels at
@@ -45,13 +46,13 @@ Python Package Index with a recent version of pip (8+):
 
 .. code-block:: console
 
-    $ pip install shapely==1.6b1
+    $ pip install shapely==1.6b2
 
 A few extra speedups that require Numpy can be had by running
 
 .. code-block:: console
 
-    $ pip install shapely[vectorized]==1.6b1
+    $ pip install shapely[vectorized]==1.6b2
 
 If you want to build Shapely from source for compatibility with
 other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -62,8 +63,8 @@ you may ignore the binary wheels.
     $ pip install shapely --no-binary shapely
 
 Binary wheels are also available for Linux. To get them, use `pip shapely
-shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-shapely==1.6b1`.
+shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+shapely==1.6b2`.
 
 In other situations, install `geos_c` libs and headers by any means 
 (for example, `brew install geos` on OS X or
@@ -82,8 +83,9 @@ variable, e.g.:
 .. code-block:: console
 
     $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-Shapely is also provided by popular Python distributions like Canopy (Enthought)
-and Anaconda (Continuum Analytics).
+
+Shapely is also provided by popular Python distributions like Canopy
+(Enthought) and Anaconda (Continuum Analytics).
 
 Usage
 =====

{Shapely-1.6b1 → Shapely-1.6b2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b1
+Version: 1.6b2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -13,6 +13,7 @@ Description: =======
         .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
            :target: https://travis-ci.org/Toblerity/Shapely
         
+        .. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
            :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
         
         Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -40,7 +41,7 @@ Description: =======
         * Python >=2.6 (including Python 3.x)
         * GEOS >=3.3 
         
-        Installing Shapely (1.6b1)
+        Installing Shapely (1.6b2)
         ==========================
         
         Windows users have two good installation options: the wheels at
@@ -53,13 +54,13 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install shapely==1.6b1
+            $ pip install shapely==1.6b2
         
         A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ pip install shapely[vectorized]==1.6b1
+            $ pip install shapely[vectorized]==1.6b2
         
         If you want to build Shapely from source for compatibility with
         other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -70,8 +71,8 @@ Description: =======
             $ pip install shapely --no-binary shapely
         
         Binary wheels are also available for Linux. To get them, use `pip shapely
-        shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-        shapely==1.6b1`.
+        shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+        shapely==1.6b2`.
         
         In other situations, install `geos_c` libs and headers by any means 
         (for example, `brew install geos` on OS X or
@@ -90,8 +91,9 @@ Description: =======
         .. code-block:: console
         
             $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-        Shapely is also provided by popular Python distributions like Canopy (Enthought)
-        and Anaconda (Continuum Analytics).
+        
+        Shapely is also provided by popular Python distributions like Canopy
+        (Enthought) and Anaconda (Continuum Analytics).
         
         Usage
         =====
@@ -237,6 +239,13 @@ Description: =======
         Changes
         =======
         
+        1.6b2 (2016-12-12)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
         1.6b1 (2016-12-12)
         ------------------
         

Shapely-1.6b2/VERSION.txt

@@ -0,0 +1 @@
+1.6b2

Shapely-1.6b2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.6b2"

{Shapely-1.6b1 → Shapely-1.6b2}/shapely/geometry/geo.py

@@ -8,6 +8,7 @@ from .polygon import Polygon, asPolygon
 from .multipoint import MultiPoint, asMultiPoint
 from .multilinestring import MultiLineString, asMultiLineString
 from .multipolygon import MultiPolygon, MultiPolygonAdapter
+from .collection import GeometryCollection
 
 
 def box(minx, miny, maxx, maxy, ccw=True):
@@ -38,6 +39,9 @@ def shape(context):
         return MultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
         return MultiPolygon(ob["coordinates"], context_type='geojson')
+    elif geom_type == "geometrycollection":
+        geoms = [shape(g) for g in ob.get("geometries", [])]
+        return GeometryCollection(geoms)
     else:
         raise ValueError("Unknown geometry type: %s" % geom_type)
 
@@ -67,6 +71,9 @@ def asShape(context):
         return asMultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
         return MultiPolygonAdapter(ob["coordinates"], context_type='geojson')
+    elif geom_type == "geometrycollection":
+        geoms = [asShape(g) for g in ob.get("geometries", [])]
+        return GeometryCollection(geoms)
     else:
         raise ValueError("Unknown geometry type: %s" % geom_type)
 

Shapely-1.6b2/tests/test_collection.py

@@ -0,0 +1,68 @@
+from . import unittest
+from shapely.geometry import LineString
+from shapely.geometry.collection import GeometryCollection
+from shapely.geometry import shape
+from shapely.geometry import asShape
+
+
+class CollectionTestCase(unittest.TestCase):
+
+    def test_array_interface(self):
+        m = GeometryCollection()
+        self.assertEqual(len(m), 0)
+        self.assertEqual(m.geoms, [])
+
+    def test_child_with_deleted_parent(self):
+        # test that we can remove a collection while having
+        # childs around
+        a = LineString([(0, 0), (1, 1), (1, 2), (2, 2)])
+        b = LineString([(0, 0), (1, 1), (2, 1), (2, 2)])
+        collection = a.intersection(b)
+
+        child = collection.geoms[0]
+        # delete parent of child
+        del collection
+
+        # access geometry, this should not seg fault as 1.2.15 did
+        self.assertIsNotNone(child.wkt)
+
+    def test_geointerface(self):
+        d = {"type": "GeometryCollection","geometries": [
+                {"type": "Point", "coordinates": (0, 3)},
+                {"type": "LineString", "coordinates": ((2, 0), (1, 0))}
+            ]}
+
+        # asShape
+        m = asShape(d)
+        self.assertEqual(m.geom_type, "GeometryCollection")
+        self.assertEqual(len(m), 2)
+        geom_types = [g.geom_type for g in m.geoms]
+        self.assertIn("Point", geom_types)
+        self.assertIn("LineString", geom_types)
+
+        # shape
+        m = shape(d)
+        self.assertEqual(m.geom_type, "GeometryCollection")
+        self.assertEqual(len(m), 2)
+        geom_types = [g.geom_type for g in m.geoms]
+        self.assertIn("Point", geom_types)
+        self.assertIn("LineString", geom_types)
+
+    def test_empty_geointerface(self):
+        d = {"type": "GeometryCollection", "geometries": []}
+
+        # asShape
+        m = asShape(d)
+        self.assertEqual(m.geom_type, "GeometryCollection")
+        self.assertEqual(len(m), 0)
+        self.assertEqual(m.geoms, [])
+
+        # shape
+        m = shape(d)
+        self.assertEqual(m.geom_type, "GeometryCollection")
+        self.assertEqual(len(m), 0)
+        self.assertEqual(m.geoms, [])
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(CollectionTestCase)

Shapely-1.6b1/VERSION.txt

@@ -1 +0,0 @@
-1.6b1

Shapely-1.6b1/shapely/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.6b1"

Shapely-1.6b1/tests/test_collection.py

@@ -1,29 +0,0 @@
-from . import unittest
-from shapely.geometry import LineString
-from shapely.geometry.collection import GeometryCollection
-
-
-class CollectionTestCase(unittest.TestCase):
-
-    def test_array_interface(self):
-        m = GeometryCollection()
-        self.assertEqual(len(m), 0)
-        self.assertEqual(m.geoms, [])
-
-    def test_child_with_deleted_parent(self):
-        # test that we can remove a collection while having
-        # childs around
-        a = LineString([(0, 0), (1, 1), (1, 2), (2, 2)])
-        b = LineString([(0, 0), (1, 1), (2, 1), (2, 2)])
-        collection = a.intersection(b)
-
-        child = collection.geoms[0]
-        # delete parent of child
-        del collection
-
-        # access geometry, this should not seg fault as 1.2.15 did
-        self.assertIsNotNone(child.wkt)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromTestCase(CollectionTestCase)

{Shapely-1.6b1 → Shapely-1.6b2}/setup.cfg

@@ -3,6 +3,6 @@ testpaths = tests
 
 [egg_info]
 tag_build = 
-tag_svn_revision = 0
 tag_date = 0
+tag_svn_revision = 0