shapely 1.4.4__tar.gz → 1.5.1__tar.gz

{Shapely-1.4.4 → Shapely-1.5.1}/CHANGES.txt

@@ -1,6 +1,18 @@
 Changes
 =======
 
+1.5.1 (2014-12-04)
+------------------
+- Restore geometry hashing (#209).
+
+1.5.0 (2014-12-02)
+------------------
+- Affine transformation speedups (#197).
+- New `==` rich comparison (#195).
+- Geometry collection constructor (#200).
+- ops.snap() backed by GEOSSnap (#201).
+- Clearer exceptions in cases of topological invalidity (#203).
+
 1.4.4 (2014-11-02)
 ------------------
 - Proper conversion of numpy float32 vals to coords (#186).

{Shapely-1.4.4 → Shapely-1.5.1}/CREDITS.txt

@@ -12,6 +12,7 @@ Patches contributed by:
 
 * Allan Adair (https://github.com/allanadair)
 * Joshua Arnott (https://github.com/snorfalorpagus)
+* David Baumgold (https://github.com/singingwolfboy)
 * Howard Butler
 * Gabi Davar (https://github.com/mindw)
 * Phil Elson (https://github.com/pelson)

{Shapely-1.4.4/Shapely.egg-info → Shapely-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.4
+Version: 1.5.1
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,21 +33,24 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.4 requires
+        Shapely 1.5 requires
         
         * Python >=2.6 (including Python 3.x)
-        * libgeos_c >=3.3 (Shapely 1.2 requires only libgeos_c 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
         
-        Installation
-        ============
+        Installing Shapely
+        ==================
+        
+        Windows users should download an executable installer from
+        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
         
-        Windows users should use the executable installer, which contains the required
-        GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-        is on the system library path, and install from the Python package index.
+        On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
+        `apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
+        system library path, and install Shapely from the Python package index.
         
         .. code-block:: console
         
-            $ pip install shapely
+            $ pip install -U shapely
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -83,46 +86,8 @@ Description: =======
             >>> dumps(loads('POINT (0 0)'))
             'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear objects, such as the rings of a polygon (like ``patch`` above),
-        provide the Numpy array interface.
-        
-        .. code-block:: pycon
-        
-            >>> import numpy as np
-            >>> np.array(patch.exterior)
-            array([[  1.00000000e+01,   0.00000000e+00],
-                   [  9.95184727e+00,  -9.80171403e-01],
-                   [  9.80785280e+00,  -1.95090322e+00],
-                   ...
-                   [  1.00000000e+01,   0.00000000e+00]])
-        
-        That yields a Numpy array of ``[x, y]`` arrays. This is not always exactly what one
-        wants for plotting shapes with Matplotlib (for example), so Shapely adds
-        a ``xy`` property for obtaining separate arrays of coordinate x and y values.
-        
-        .. code-block:: pycon
-        
-            >>> x, y = patch.exterior.xy
-            >>> np.array(x)
-            array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
-        
-        Numpy arrays of ``[x, y]`` arrays can also be adapted to Shapely linestrings.
-        
-        .. code-block:: pycon
-        
-            >>> from shapely.geometry import LineString
-            >>> LineString(np.array(patch.exterior)).length
-            62.806623139095073
-        
-        Numpy arrays of x and y must be transposed.
-        
-        .. code-block:: pycon
-        
-            >>> LineString(np.transpose(np.array(patch.exterior.xy))).length
-            62.80662313909507
-        
-        Shapely can also integrate with other Python GIS packages using data modeled
-        after GeoJSON.
+        Shapely can also integrate with other Python GIS packages using GeoJSON-like
+        dicts.
         
         .. code-block:: pycon
         
@@ -186,6 +151,7 @@ Description: =======
         
         * Allan Adair (https://github.com/allanadair)
         * Joshua Arnott (https://github.com/snorfalorpagus)
+        * David Baumgold (https://github.com/singingwolfboy)
         * Howard Butler
         * Gabi Davar (https://github.com/mindw)
         * Phil Elson (https://github.com/pelson)
@@ -229,6 +195,18 @@ Description: =======
         Changes
         =======
         
+        1.5.1 (2014-12-04)
+        ------------------
+        - Restore geometry hashing (#209).
+        
+        1.5.0 (2014-12-02)
+        ------------------
+        - Affine transformation speedups (#197).
+        - New `==` rich comparison (#195).
+        - Geometry collection constructor (#200).
+        - ops.snap() backed by GEOSSnap (#201).
+        - Clearer exceptions in cases of topological invalidity (#203).
+        
         1.4.4 (2014-11-02)
         ------------------
         - Proper conversion of numpy float32 vals to coords (#186).

{Shapely-1.4.4 → Shapely-1.5.1}/README.rst

@@ -25,21 +25,24 @@ but can be readily integrated with packages that are. For more details, see:
 Requirements
 ============
 
-Shapely 1.4 requires
+Shapely 1.5 requires
 
 * Python >=2.6 (including Python 3.x)
-* libgeos_c >=3.3 (Shapely 1.2 requires only libgeos_c 3.1 but YMMV)
+* GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
 
-Installation
-============
+Installing Shapely
+==================
+
+Windows users should download an executable installer from
+http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
 
-Windows users should use the executable installer, which contains the required
-GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-is on the system library path, and install from the Python package index.
+On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
+`apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
+system library path, and install Shapely from the Python package index.
 
 .. code-block:: console
 
-    $ pip install shapely
+    $ pip install -U shapely
 
 Shapely is also provided by popular Python distributions like Canopy (Enthought)
 and Anaconda (Continuum Analytics).
@@ -75,46 +78,8 @@ modules provide dumpers and loaders inspired by Python's pickle module.
     >>> dumps(loads('POINT (0 0)'))
     'POINT (0.0000000000000000 0.0000000000000000)'
 
-All linear objects, such as the rings of a polygon (like ``patch`` above),
-provide the Numpy array interface.
-
-.. code-block:: pycon
-
-    >>> import numpy as np
-    >>> np.array(patch.exterior)
-    array([[  1.00000000e+01,   0.00000000e+00],
-           [  9.95184727e+00,  -9.80171403e-01],
-           [  9.80785280e+00,  -1.95090322e+00],
-           ...
-           [  1.00000000e+01,   0.00000000e+00]])
-
-That yields a Numpy array of ``[x, y]`` arrays. This is not always exactly what one
-wants for plotting shapes with Matplotlib (for example), so Shapely adds
-a ``xy`` property for obtaining separate arrays of coordinate x and y values.
-
-.. code-block:: pycon
-
-    >>> x, y = patch.exterior.xy
-    >>> np.array(x)
-    array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
-
-Numpy arrays of ``[x, y]`` arrays can also be adapted to Shapely linestrings.
-
-.. code-block:: pycon
-
-    >>> from shapely.geometry import LineString
-    >>> LineString(np.array(patch.exterior)).length
-    62.806623139095073
-
-Numpy arrays of x and y must be transposed.
-
-.. code-block:: pycon
-
-    >>> LineString(np.transpose(np.array(patch.exterior.xy))).length
-    62.80662313909507
-
-Shapely can also integrate with other Python GIS packages using data modeled
-after GeoJSON.
+Shapely can also integrate with other Python GIS packages using GeoJSON-like
+dicts.
 
 .. code-block:: pycon
 

{Shapely-1.4.4 → Shapely-1.5.1/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.4.4
+Version: 1.5.1
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,21 +33,24 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.4 requires
+        Shapely 1.5 requires
         
         * Python >=2.6 (including Python 3.x)
-        * libgeos_c >=3.3 (Shapely 1.2 requires only libgeos_c 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
         
-        Installation
-        ============
+        Installing Shapely
+        ==================
+        
+        Windows users should download an executable installer from
+        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
         
-        Windows users should use the executable installer, which contains the required
-        GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-        is on the system library path, and install from the Python package index.
+        On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
+        `apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
+        system library path, and install Shapely from the Python package index.
         
         .. code-block:: console
         
-            $ pip install shapely
+            $ pip install -U shapely
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -83,46 +86,8 @@ Description: =======
             >>> dumps(loads('POINT (0 0)'))
             'POINT (0.0000000000000000 0.0000000000000000)'
         
-        All linear objects, such as the rings of a polygon (like ``patch`` above),
-        provide the Numpy array interface.
-        
-        .. code-block:: pycon
-        
-            >>> import numpy as np
-            >>> np.array(patch.exterior)
-            array([[  1.00000000e+01,   0.00000000e+00],
-                   [  9.95184727e+00,  -9.80171403e-01],
-                   [  9.80785280e+00,  -1.95090322e+00],
-                   ...
-                   [  1.00000000e+01,   0.00000000e+00]])
-        
-        That yields a Numpy array of ``[x, y]`` arrays. This is not always exactly what one
-        wants for plotting shapes with Matplotlib (for example), so Shapely adds
-        a ``xy`` property for obtaining separate arrays of coordinate x and y values.
-        
-        .. code-block:: pycon
-        
-            >>> x, y = patch.exterior.xy
-            >>> np.array(x)
-            array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
-        
-        Numpy arrays of ``[x, y]`` arrays can also be adapted to Shapely linestrings.
-        
-        .. code-block:: pycon
-        
-            >>> from shapely.geometry import LineString
-            >>> LineString(np.array(patch.exterior)).length
-            62.806623139095073
-        
-        Numpy arrays of x and y must be transposed.
-        
-        .. code-block:: pycon
-        
-            >>> LineString(np.transpose(np.array(patch.exterior.xy))).length
-            62.80662313909507
-        
-        Shapely can also integrate with other Python GIS packages using data modeled
-        after GeoJSON.
+        Shapely can also integrate with other Python GIS packages using GeoJSON-like
+        dicts.
         
         .. code-block:: pycon
         
@@ -186,6 +151,7 @@ Description: =======
         
         * Allan Adair (https://github.com/allanadair)
         * Joshua Arnott (https://github.com/snorfalorpagus)
+        * David Baumgold (https://github.com/singingwolfboy)
         * Howard Butler
         * Gabi Davar (https://github.com/mindw)
         * Phil Elson (https://github.com/pelson)
@@ -229,6 +195,18 @@ Description: =======
         Changes
         =======
         
+        1.5.1 (2014-12-04)
+        ------------------
+        - Restore geometry hashing (#209).
+        
+        1.5.0 (2014-12-02)
+        ------------------
+        - Affine transformation speedups (#197).
+        - New `==` rich comparison (#195).
+        - Geometry collection constructor (#200).
+        - ops.snap() backed by GEOSSnap (#201).
+        - Clearer exceptions in cases of topological invalidity (#203).
+        
         1.4.4 (2014-11-02)
         ------------------
         - Proper conversion of numpy float32 vals to coords (#186).

{Shapely-1.4.4 → Shapely-1.5.1}/Shapely.egg-info/SOURCES.txt

@@ -68,6 +68,7 @@ tests/test_equality.py
 tests/test_geointerface.py
 tests/test_geomseq.py
 tests/test_getitem.py
+tests/test_hash.py
 tests/test_invalid_geometries.py
 tests/test_iterops.py
 tests/test_linear_referencing.py
@@ -91,6 +92,7 @@ tests/test_predicates.py
 tests/test_prepared.py
 tests/test_products_z.py
 tests/test_singularity.py
+tests/test_snap.py
 tests/test_strtree.py
 tests/test_styles.py
 tests/test_transform.py

Shapely-1.5.1/VERSION.txt

@@ -0,0 +1 @@
+1.5.1

{Shapely-1.4.4 → Shapely-1.5.1}/docs/manual.rst

@@ -1018,13 +1018,40 @@ evaluate topological, set-theoretic relationships. In a few cases the results
 may not be what one might expect starting from different assumptions. All take
 another geometric object as argument and return ``True`` or ``False``.
 
+.. method:: object.__eq__(other)
+
+  Returns ``True`` if the two objects are of the same geometric type, and
+  the coordinates of the two objects match precisely.
+
+.. method:: object.equals(other)
+
+  Returns ``True`` if the set-theoretic `boundary`, `interior`, and `exterior`
+  of the object coincide with those of the other.
+
+The coordinates passed to the object constructors are of these sets, and
+determine them, but are not the entirety of the sets. This is a potential
+"gotcha" for new users.  Equivalent lines, for example, can be constructed
+differently.
+
+.. code-block:: pycon
+
+  >>> a = LineString([(0, 0), (1, 1)])
+  >>> b = LineString([(0, 0), (0.5, 0.5), (1, 1)])
+  >>> c = LineString([(0, 0), (0, 0), (1, 1)])
+  >>> a.equals(b)
+  True
+  >>> a == b
+  False
+  >>> b.equals(c)
+  True
+  >>> b == c
+  False
+
 .. method:: object.almost_equals(other[, decimal=6])
 
   Returns ``True`` if the object is approximately equal to the `other` at all
   points to specified `decimal` place precision.
 
-See also :meth:`equals`.
-
 .. method:: object.contains(other)
 
   Returns ``True`` if the object's `interior` contains the `boundary` and
@@ -1092,29 +1119,6 @@ A line does not cross a point that it contains.
 
 This predicate applies to all types and is the inverse of :meth:`intersects`.
 
-.. method:: object.equals(other)
-
-  Returns ``True`` if the set-theoretic `boundary`, `interior`, and `exterior`
-  of the object coincide with those of the other.
-
-The coordinates passed to the object constructors are of these sets, and
-determine them, but are not the entirety of the sets. This is a potential
-"gotcha" for new users.  Equivalent lines, for example, can be constructed
-differently.
-
-.. code-block:: pycon
-
-  >>> a = LineString([(0, 0), (1, 1)])
-  >>> b = LineString([(0, 0), (0.5, 0.5), (1, 1)])
-  >>> c = LineString([(0, 0), (0, 0), (1, 1)])
-  >>> a.equals(b)
-  True
-  >>> b.equals(c)
-  True
-
-This predicate should not be mistaken for Python's ``==`` or ``is``
-constructions.
-
 .. method:: object.intersects(other)
 
   Returns ``True`` if the `boundary` and `interior` of the object intersect in
@@ -2019,6 +2023,31 @@ the nearest points in a pair of geometries.
 
 Note that the nearest points may not be existing vertices in the geometries.
 
+Snapping
+--------
+
+The :func:`~shapely.ops.snap` function in `shapely.ops` snaps the vertices in
+one geometry to the vertices in a second geometry with a given tolerance.
+
+.. function:: shapely.ops.snap(geom1, geom2, tolerance)
+
+   Snaps vertices in `geom1` to vertices in the `geom2`. A copy of the snapped
+   geometry is returned. The input geometries are not modified.
+
+   The `tolerance` argument specifies the minimum distance between vertices for
+   them to be snapped.
+
+   `New in version 1.4.5`
+
+.. code-block:: pycon
+
+  >>> from shapely.ops import snap
+  >>> square = Polygon([(1,1), (2, 1), (2, 2), (1, 2), (1, 1)])
+  >>> line = LineString([(0,0), (0.8, 0.8), (1.8, 0.95), (2.6, 0.5)])
+  >>> result = snap(line, square, 0.5)
+  >>> result.wkt
+  'LINESTRING (0 0, 1 1, 2 1, 2.6 0.5)'
+
 Prepared Geometry Operations
 ----------------------------
 

Shapely-1.5.1/shapely/__init__.py

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

{Shapely-1.4.4 → Shapely-1.5.1}/shapely/ctypes_declarations.py

@@ -466,6 +466,10 @@ def prototype(lgeos, geos_version):
         lgeos.GEOSFree.restype = None
         lgeos.GEOSFree.argtypes = [c_void_p]
 
+    if geos_version >= (3, 3, 0):
+        lgeos.GEOSSnap.restype = c_void_p
+        lgeos.GEOSSnap.argtypes = [c_void_p, c_void_p, c_double]
+
     if geos_version >= (3, 4, 0):
         lgeos.GEOSNearestPoints.restype = c_void_p
         lgeos.GEOSNearestPoints.argtypes = [c_void_p, c_void_p]

{Shapely-1.4.4 → Shapely-1.5.1}/shapely/geometry/base.py

@@ -252,6 +252,17 @@ class BaseGeometry(object):
     def __xor__(self, other):
         return self.symmetric_difference(other)
 
+    def __eq__(self, other):
+        return (
+            isinstance(other, self.__class__) and
+            tuple(self.coords) == tuple(other.coords)
+        )
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    __hash__ = object.__hash__
+
     # Array and ctypes interfaces
     # ---------------------------
 
@@ -561,7 +572,7 @@ class BaseGeometry(object):
     @property
     def is_closed(self):
         """True if the geometry is closed, else False
-        
+
         Applicable only to 1-D geometries."""
         if self.geom_type == 'LinearRing':
             return True
@@ -721,6 +732,18 @@ class BaseMultipartGeometry(BaseGeometry):
         else:
             return ()[index]
 
+    def __eq__(self, other):
+        return (
+            isinstance(other, self.__class__) and
+            len(self) == len(other) and
+            all(x == y for x, y in zip(self, other))
+        )
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    __hash__ = object.__hash__
+
     def svg(self, scale_factor=1.):
         """
         SVG representation of the geometry. Scale factor is multiplied by

Shapely-1.5.1/shapely/geometry/collection.py

@@ -0,0 +1,79 @@
+"""Multi-part collections of geometries
+"""
+
+from ctypes import c_void_p
+
+from shapely.geos import lgeos
+from shapely.geometry.base import BaseGeometry
+from shapely.geometry.base import BaseMultipartGeometry
+from shapely.geometry.base import HeterogeneousGeometrySequence
+from shapely.geometry.base import geos_geom_from_py
+
+
+class GeometryCollection(BaseMultipartGeometry):
+
+    """A heterogenous collection of geometries
+
+    Attributes
+    ----------
+    geoms : sequence
+        A sequence of Shapely geometry instances
+    """
+
+    def __init__(self, geoms=None):
+        """
+        Parameters
+        ----------
+        geoms : list
+            A list of shapely geometry instances, which may be heterogenous.
+        
+        Example
+        -------
+        Create a GeometryCollection with a Point and a LineString
+        
+          >>> p = Point(51, -1)
+          >>> l = LineString([(52, -1), (49, 2)])
+          >>> gc = GeometryCollection([p, l])
+        """
+        BaseMultipartGeometry.__init__(self)
+        if not geoms:
+            pass
+        else:
+            self._geom, self._ndim = geos_geometrycollection_from_py(geoms)
+
+    @property
+    def __geo_interface__(self):
+        geometries = []
+        for geom in self.geoms:
+            geometries.append(geom.__geo_interface__)
+        return dict(type='GeometryCollection', geometries=geometries)
+
+    @property
+    def geoms(self):
+        if self.is_empty:
+            return []
+        return HeterogeneousGeometrySequence(self)
+
+def geos_geometrycollection_from_py(ob):
+    """Creates a GEOS GeometryCollection from a list of geometries"""
+    L = len(ob)
+    N = 2
+    subs = (c_void_p * L)()
+    for l in range(L):
+        assert(isinstance(ob[l], BaseGeometry))
+        if ob[l].has_z:
+            N = 3
+        geom, n = geos_geom_from_py(ob[l])
+        subs[l] = geom
+    
+    return (lgeos.GEOSGeom_createCollection(7, subs, L), N)
+
+# Test runner
+def _test():
+    import doctest
+    doctest.testmod()
+
+
+if __name__ == "__main__":
+    _test()
+

{Shapely-1.4.4 → Shapely-1.5.1}/shapely/geometry/multilinestring.py

@@ -117,46 +117,28 @@ def geos_multilinestring_from_py(ob):
     if isinstance(ob, MultiLineString):
          return geos_geom_from_py(ob)
 
+    obs = getattr(ob, 'geoms', ob)
+    L = len(obs)
+    assert L >= 1
+    exemplar = obs[0]
     try:
-        # From array protocol
-        array = ob.__array_interface__
-        assert len(array['shape']) == 1
-        L = array['shape'][0]
-        assert L >= 1
-
-        # Array of pointers to sub-geometries
-        subs = (c_void_p * L)()
-
-        for l in range(L):
-            geom, ndims = linestring.geos_linestring_from_py(array['data'][l])
-            subs[i] = cast(geom, c_void_p)
-
-        if lgeos.GEOSHasZ(subs[0]):
-            N = 3
-        else:
-            N = 2
-
-    except (NotImplementedError, AttributeError):
-        obs = getattr(ob, 'geoms', ob)
-        L = len(obs)
-        exemplar = obs[0]
-        try:
-            N = len(exemplar[0])
-        except TypeError:
-            N = exemplar._ndim
-        assert L >= 1
-        assert N == 2 or N == 3
-
-        # Array of pointers to point geometries
-        subs = (c_void_p * L)()
-        
-        # add to coordinate sequence
-        for l in range(L):
-            geom, ndims = linestring.geos_linestring_from_py(obs[l])
-            subs[l] = cast(geom, c_void_p)
+        N = len(exemplar[0])
+    except TypeError:
+        N = exemplar._ndim
+    if N not in (2, 3):
+        raise ValueError("Invalid coordinate dimensionality")
+
+    # Array of pointers to point geometries
+    subs = (c_void_p * L)()
+    
+    # add to coordinate sequence
+    for l in range(L):
+        geom, ndims = linestring.geos_linestring_from_py(obs[l])
+        subs[l] = cast(geom, c_void_p)
             
     return (lgeos.GEOSGeom_createCollection(5, subs, L), N)
 
+
 # Test runner
 def _test():
     import doctest