shapely 1.7a1__tar.gz → 1.7a2__tar.gz

{Shapely-1.7a1 → Shapely-1.7a2}/CHANGES.txt

@@ -1,8 +1,42 @@
 Changes
 =======
 
-Next
------
+1.7a2 (2019-06-21)
+------------------
+
+- Nearest neighbor search has been added to STRtree (#668).
+- Disallow sequences of MultiPolygons as arguments to the MultiPolygon
+  constructor, resolving #588.
+- Removed vendorized `functools` functions previously used to support
+  Python 2.5.
+
+Bug fixes:
+
+- Avoid reloading the GEOS shared library when using an installed binary wheel
+  on OS X (#735), resolving issue #553.
+- The shapely.ops.orient function can now orient multi polygons and geometry
+  collections as well as polygons (#733).
+- Polygons can now be constructed from sequences of point objects as well as
+  sequences of x, y sequences (#732).
+- The exterior of an empty polygon is now equal to an empty linear ring (#731).
+- The bounds property of an empty point object now returns an empty tuple,
+  consistent with other geometry types (#723).
+- Segmentation faults when non-string values are passed to the WKT loader are
+  avoided by #700.
+- Failure of ops.substring when the sub linestring coincides with the beginning
+  of the linestring has been fixed (#658).
+- Segmentation faults from interpolating on an empty linestring are prevented
+  by #655.
+- A missing special case for rectangular polygons has been added to the
+  polylabel algorithm (#644).
+- LinearRing can be created from a LineString (#638).
+- The prepared geoemtry validation condition has been tightened in #632 to fix
+  the bug reported in #631.
+- Attempting to interpolate an empty geometry no longer results in a
+  segmentation fault, raising `ValueError` instead (#653).
+
+1.7a1 (2018-07-29)
+------------------
 
 New features:
 

{Shapely-1.7a1 → Shapely-1.7a2}/CREDITS.txt

@@ -52,6 +52,7 @@ Shapely is written by:
 * joelostblom <joelostblom@users.noreply.github.com>
 * Marco De Nadai <me@marcodena.it>
 * Johan Euphrosine <proppy@aminche.com>
+* James Gaboardi <jgaboardi@gmail.com>
 
 See also: https://github.com/Toblerity/Shapely/graphs/contributors.
 

{Shapely-1.7a1/Shapely.egg-info → Shapely-1.7a2}/PKG-INFO

@@ -1,10 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: Shapely
-Version: 1.7a1
+Version: 1.7a2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
+Maintainer: Sean Gillies
+Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Description: =======
         Shapely
@@ -223,6 +225,7 @@ Description: =======
         * joelostblom <joelostblom@users.noreply.github.com>
         * Marco De Nadai <me@marcodena.it>
         * Johan Euphrosine <proppy@aminche.com>
+        * James Gaboardi <jgaboardi@gmail.com>
         
         See also: https://github.com/Toblerity/Shapely/graphs/contributors.
         
@@ -241,8 +244,42 @@ Description: =======
         Changes
         =======
         
-        Next
-        -----
+        1.7a2 (2019-06-21)
+        ------------------
+        
+        - Nearest neighbor search has been added to STRtree (#668).
+        - Disallow sequences of MultiPolygons as arguments to the MultiPolygon
+          constructor, resolving #588.
+        - Removed vendorized `functools` functions previously used to support
+          Python 2.5.
+        
+        Bug fixes:
+        
+        - Avoid reloading the GEOS shared library when using an installed binary wheel
+          on OS X (#735), resolving issue #553.
+        - The shapely.ops.orient function can now orient multi polygons and geometry
+          collections as well as polygons (#733).
+        - Polygons can now be constructed from sequences of point objects as well as
+          sequences of x, y sequences (#732).
+        - The exterior of an empty polygon is now equal to an empty linear ring (#731).
+        - The bounds property of an empty point object now returns an empty tuple,
+          consistent with other geometry types (#723).
+        - Segmentation faults when non-string values are passed to the WKT loader are
+          avoided by #700.
+        - Failure of ops.substring when the sub linestring coincides with the beginning
+          of the linestring has been fixed (#658).
+        - Segmentation faults from interpolating on an empty linestring are prevented
+          by #655.
+        - A missing special case for rectangular polygons has been added to the
+          polylabel algorithm (#644).
+        - LinearRing can be created from a LineString (#638).
+        - The prepared geoemtry validation condition has been tightened in #632 to fix
+          the bug reported in #631.
+        - Attempting to interpolate an empty geometry no longer results in a
+          segmentation fault, raising `ValueError` instead (#653).
+        
+        1.7a1 (2018-07-29)
+        ------------------
         
         New features:
         
@@ -887,3 +924,6 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
 Requires: libgeos_c (>=3.3)
+Provides-Extra: test
+Provides-Extra: vectorized
+Provides-Extra: all

{Shapely-1.7a1 → Shapely-1.7a2/Shapely.egg-info}/PKG-INFO

@@ -1,10 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: Shapely
-Version: 1.7a1
+Version: 1.7a2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
+Maintainer: Sean Gillies
+Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Description: =======
         Shapely
@@ -223,6 +225,7 @@ Description: =======
         * joelostblom <joelostblom@users.noreply.github.com>
         * Marco De Nadai <me@marcodena.it>
         * Johan Euphrosine <proppy@aminche.com>
+        * James Gaboardi <jgaboardi@gmail.com>
         
         See also: https://github.com/Toblerity/Shapely/graphs/contributors.
         
@@ -241,8 +244,42 @@ Description: =======
         Changes
         =======
         
-        Next
-        -----
+        1.7a2 (2019-06-21)
+        ------------------
+        
+        - Nearest neighbor search has been added to STRtree (#668).
+        - Disallow sequences of MultiPolygons as arguments to the MultiPolygon
+          constructor, resolving #588.
+        - Removed vendorized `functools` functions previously used to support
+          Python 2.5.
+        
+        Bug fixes:
+        
+        - Avoid reloading the GEOS shared library when using an installed binary wheel
+          on OS X (#735), resolving issue #553.
+        - The shapely.ops.orient function can now orient multi polygons and geometry
+          collections as well as polygons (#733).
+        - Polygons can now be constructed from sequences of point objects as well as
+          sequences of x, y sequences (#732).
+        - The exterior of an empty polygon is now equal to an empty linear ring (#731).
+        - The bounds property of an empty point object now returns an empty tuple,
+          consistent with other geometry types (#723).
+        - Segmentation faults when non-string values are passed to the WKT loader are
+          avoided by #700.
+        - Failure of ops.substring when the sub linestring coincides with the beginning
+          of the linestring has been fixed (#658).
+        - Segmentation faults from interpolating on an empty linestring are prevented
+          by #655.
+        - A missing special case for rectangular polygons has been added to the
+          polylabel algorithm (#644).
+        - LinearRing can be created from a LineString (#638).
+        - The prepared geoemtry validation condition has been tightened in #632 to fix
+          the bug reported in #631.
+        - Attempting to interpolate an empty geometry no longer results in a
+          segmentation fault, raising `ValueError` instead (#653).
+        
+        1.7a1 (2018-07-29)
+        ------------------
         
         New features:
         
@@ -887,3 +924,6 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
 Requires: libgeos_c (>=3.3)
+Provides-Extra: test
+Provides-Extra: vectorized
+Provides-Extra: all

{Shapely-1.7a1 → Shapely-1.7a2}/Shapely.egg-info/SOURCES.txt

@@ -31,7 +31,6 @@ shapely/affinity.py
 shapely/coords.py
 shapely/ctypes_declarations.py
 shapely/errors.py
-shapely/ftools.py
 shapely/geos.py
 shapely/impl.py
 shapely/iterops.py
@@ -66,6 +65,7 @@ shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
 shapely/speedups/_speedups.pyx
 shapely/vectorized/__init__.py
+shapely/vectorized/_vectorized.c
 shapely/vectorized/_vectorized.pyx
 tests/__init__.py
 tests/binascii_hex.txt
@@ -105,6 +105,7 @@ tests/test_ndarrays.py
 tests/test_nearest.py
 tests/test_operations.py
 tests/test_operators.py
+tests/test_orient.py
 tests/test_parallel_offset.py
 tests/test_persist.py
 tests/test_pickle.py
@@ -120,6 +121,7 @@ tests/test_singularity.py
 tests/test_snap.py
 tests/test_split.py
 tests/test_strtree.py
+tests/test_strtree_nearest.py
 tests/test_styles.py
 tests/test_substring.py
 tests/test_svg.py

Shapely-1.7a2/VERSION.txt

@@ -0,0 +1 @@
+1.7a2

{Shapely-1.7a1 → Shapely-1.7a2}/docs/manual.rst

@@ -11,7 +11,7 @@ The Shapely User Manual
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
 
-.. __: http://creativecommons.org/licenses/by/3.0/us/
+.. __: https://creativecommons.org/licenses/by/3.0/us/
 
 :Abstract:
   This document explains how to use the Shapely Python package for
@@ -107,7 +107,7 @@ The standard data model has additional constraints specific to certain types
 of geometric objects that will be discussed in following sections of this
 manual.
 
-See also http://www.vividsolutions.com/jts/discussion.htm#spatialDataModel
+See also https://web.archive.org/web/20160719195511/http://www.vividsolutions.com/jts/discussion.htm
 for more illustrations of this data model.
 
 .. _intro-relationships:
@@ -222,8 +222,9 @@ General Attributes and Methods
 .. method:: object.hausdorff_distance(other)
 
   Returns the Hausdorff distance (``float``) to the `other` geometric object.
-  The Hausdorff distance is the furthest distance from any point on the first
-  geometry to any point on the second geometry.
+  The Hausdorff distance between two geometries is the furthest distance that
+  a point on either geometry can be from the nearest point to it on the other
+  geometry.
 
   `New in Shapely 1.6.0`
 
@@ -1348,7 +1349,7 @@ the square.
   '0F2FF1FF2'
 
 Further discussion of the DE-9IM matrix is beyond the scope of this manual. See
-[4]_ and http://pypi.python.org/pypi/de9im.
+[4]_ and https://pypi.org/project/de9im/.
 
 .. _analysis-methods:
 
@@ -1506,7 +1507,7 @@ boundaries.
 .. note::
 
   :meth:`union` is an expensive way to find the cumulative union
-  of many objects. See :func:`shapely.ops.cascaded_union` for a more effective
+  of many objects. See :func:`shapely.ops.unary_union` for a more effective
   method.
 
 Constructive Methods
@@ -1676,8 +1677,9 @@ linestring feature (right).
   object on its right or its left side.
 
   Distance must be a positive float value. The side parameter may be 'left' or
-  'right'. The resolution of the offset around each vertex of the object is
-  parameterized as in the buffer method.
+  'right'. Left and right is determined by following the direction of given 
+  geometric points of the LineString. The resolution of the offset around 
+  each vertex of the object is parameterized as in the buffer method.
 
   The join style is for outside corners between line segments. Accepted integer
   values are 1 (round), 2 (mitre), and 3 (bevel). See also
@@ -1766,13 +1768,21 @@ preserved or supported by 3D affine transformations.
   which represents the augmented matrix:
 
   .. math::
-    \begin{bmatrix} x' & y' & 1 \end{bmatrix} =
-    \begin{bmatrix} x  & y  & 1 \end{bmatrix}
+    \begin{bmatrix}
+      x' \\
+      y' \\
+      1
+    \end{bmatrix} =
     \begin{bmatrix}
       a & b & x_\mathrm{off} \\
       d & e & y_\mathrm{off} \\
       0 & 0 & 1
     \end{bmatrix}
+    \begin{bmatrix}
+      x \\
+      y \\
+      1
+    \end{bmatrix}
 
   or the equations for the transformed coordinates:
 
@@ -1787,14 +1797,24 @@ preserved or supported by 3D affine transformations.
   which represents the augmented matrix:
 
   .. math::
-    \begin{bmatrix} x' & y' & z' & 1 \end{bmatrix} =
-    \begin{bmatrix} x  & y  & z  & 1 \end{bmatrix}
+    \begin{bmatrix}
+      x' \\
+      y' \\
+      z' \\
+      1
+    \end{bmatrix} =
     \begin{bmatrix}
       a & b & c & x_\mathrm{off} \\
       d & e & f & y_\mathrm{off} \\
       g & h & i & z_\mathrm{off} \\
       0 & 0 & 0 & 1
     \end{bmatrix}
+    \begin{bmatrix}
+      x \\
+      y \\
+      z \\
+      1
+    \end{bmatrix}
 
   or the equations for the transformed coordinates:
 
@@ -2069,45 +2089,54 @@ using functions in the :mod:`shapely.ops` module.
      <shapely.geometry.linestring.LineString object at 0x...>,
      <shapely.geometry.linestring.LineString object at 0x...>]
 
-Cascading Unions
+Efficient Unions
 ----------------
 
-The :func:`~shapely.ops.cascaded_union` function in `shapely.ops` is more
+The :func:`~shapely.ops.unary_union` function in `shapely.ops` is more
 efficient than accumulating with :meth:`union`.
 
-.. plot:: code/cascaded_union.py
+.. plot:: code/unary_union.py
 
-.. function:: shapely.ops.cascaded_union(geoms)
+.. function:: shapely.ops.unary_union(geoms)
 
   Returns a representation of the union of the given geometric objects.
 
+  Areas of overlapping `Polygons` will get merged. `LineStrings` will
+  get fully dissolved and noded. Duplicate `Points` will get merged.
+
   .. code-block:: pycon
 
-    >>> from shapely.ops import cascaded_union
+    >>> from shapely.ops import unary_union
     >>> polygons = [Point(i, 0).buffer(0.7) for i in range(5)]
-    >>> cascaded_union(polygons)
+    >>> unary_union(polygons)
     <shapely.geometry.polygon.Polygon object at 0x...>
 
-  The function is particularly useful in dissolving `MultiPolygons`.
+  Because the union merges the areas of overlapping `Polygons` it can be
+  used in an attempt to fix invalid `MultiPolygons`. As with the zero
+  distance :meth:`buffer` trick, your mileage may vary when using this.
 
   .. code-block:: pycon
 
     >>> m = MultiPolygon(polygons)
     >>> m.area
     7.6845438018375516
-    >>> cascaded_union(m).area
+    >>> m.is_valid
+    False
+    >>> unary_union(m).area
     6.6103013551167971
+    >>> unary_union(m).is_valid
+    True
 
-  .. note::
+.. function:: shapely.ops.cascaded_union(geoms)
 
-     In 1.2.16 :func:`shapely.ops.cascaded_union` is superceded by
-     :func:`shapely.ops.unary_union` if GEOS 3.2+ is used. The unary union
-     function can operate on different geometry types, not only polygons as is
-     the case for the older cascaded unions.
+  Returns a representation of the union of the given geometric objects.
 
-.. function:: shapely.ops.unary_union(geoms)
+  .. note::
 
-  Returns a representation of the union of the given geometric objects.
+     In 1.2.16 :func:`shapely.ops.cascaded_union` was transparently superseded by
+     :func:`shapely.ops.unary_union` if GEOS 3.3+ is used. The unary union
+     function can operate on different geometry types, not only polygons as is
+     the case for the older cascaded union.
 
 Delaunay triangulation
 ----------------------
@@ -2119,7 +2148,7 @@ Delaunay triangulation from a collection of points.
 
 .. function:: shapely.ops.triangulate(geom, tolerance=0.0, edges=False)
 
-   Returns a Delaunary triangulation of the vertices of the input geometry.
+   Returns a Delaunay triangulation of the vertices of the input geometry.
 
    The source may be any geometry type. All vertices of the geometry will be
    used as the points of the triangulation.
@@ -2591,7 +2620,7 @@ GEOS development headers during installation.
 
 You can check if the speedups are installed with the :attr:`available`
 attribute. To enable the speedups call :func:`enable`. You can revert to the
-default implementation with :func:`disable`.
+slow implementation with :func:`disable`.
 
 .. code-block:: pycon
 
@@ -2649,18 +2678,18 @@ References
    1973, pp. 112-122.
 
 
-.. _GEOS: http://trac.osgeo.org/geos/
-.. _Java Topology Suite: https://www.locationtech.org/projects/technology.jts
-.. _JTS: https://www.locationtech.org/projects/technology.jts
+.. _GEOS: https://trac.osgeo.org/geos/
+.. _Java Topology Suite: https://projects.eclipse.org/projects/locationtech.jts
+.. _JTS: https://projects.eclipse.org/projects/locationtech.jts
 .. _PostGIS: http://postgis.refractions.net
-.. _record: http://pypi.python.org/pypi/Shapely
+.. _record: https://pypi.org/project/Shapely/
 .. _Open Geospatial Consortium: http://www.opengeospatial.org/
-.. _Davis: http://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html
+.. _Davis: https://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html
 .. _Understanding spatial relations: http://edndoc.esri.com/arcsde/9.1/general_topics/understand_spatial_relations.htm
-.. _Strobl-PDF: http://giswiki.hsr.ch/images/3/3d/9dem_springer.pdf
+.. _Strobl-PDF: https://giswiki.hsr.ch/images/3/3d/9dem_springer.pdf
 .. |Strobl-PDF| replace:: PDF
-.. _JTS-PDF: http://www.vividsolutions.com/jts/bin/JTS%20Technical%20Specs.pdf
+.. _JTS-PDF: https://github.com/locationtech/jts/raw/master/doc/JTS%20Technical%20Specs.pdf
 .. |JTS-PDF| replace:: PDF
-.. _frozenset: http://docs.python.org/library/stdtypes.html#frozenset
-.. _Sorting HowTo: http://wiki.python.org/moin/HowTo/Sorting/
-.. _Python geo interface: http://gist.github.com/2217756
+.. _frozenset: https://docs.python.org/library/stdtypes.html#frozenset
+.. _Sorting HowTo: https://wiki.python.org/moin/HowTo/Sorting/
+.. _Python geo interface: https://gist.github.com/2217756

{Shapely-1.7a1 → Shapely-1.7a2}/setup.cfg

@@ -8,5 +8,4 @@ universal = 1
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 

Shapely-1.7a2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.7a2"

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/affinity.py

@@ -6,7 +6,7 @@ __all__ = ['affine_transform', 'rotate', 'scale', 'skew', 'translate']
 
 
 def affine_transform(geom, matrix):
-    """Returns a transformed geometry using an affine transformation matrix.
+    r"""Returns a transformed geometry using an affine transformation matrix.
 
     The coefficient matrix is provided as a list or tuple with 6 or 12 items
     for 2D or 3D transformations, respectively.
@@ -17,9 +17,9 @@ def affine_transform(geom, matrix):
 
     which represents the augmented matrix::
 
-                            / a  b xoff \ 
-        [x' y' 1] = [x y 1] | d  e yoff |
-                            \ 0  0   1  /
+        [x']   / a  b xoff \ [x]
+        [y'] = | d  e yoff | [y]
+        [1 ]   \ 0  0   1  / [1]
 
     or the equations for the transformed coordinates::
 
@@ -32,10 +32,10 @@ def affine_transform(geom, matrix):
 
     which represents the augmented matrix::
 
-                                 / a  b  c xoff \ 
-        [x' y' z' 1] = [x y z 1] | d  e  f yoff |
-                                 | g  h  i zoff |
-                                 \ 0  0  0   1  /
+        [x']   / a  b  c xoff \ [x]
+        [y'] = | d  e  f yoff | [y]
+        [z']   | g  h  i zoff | [z]
+        [1 ]   \ 0  0  0   1  / [1]
 
     or the equations for the transformed coordinates::
 
@@ -130,7 +130,7 @@ def interpret_origin(geom, origin, ndim):
 
 
 def rotate(geom, angle, origin='center', use_radians=False):
-    """Returns a rotated geometry on a 2D plane.
+    r"""Returns a rotated geometry on a 2D plane.
 
     The angle of rotation can be specified in either degrees (default) or
     radians by setting ``use_radians=True``. Positive angles are
@@ -169,7 +169,7 @@ def rotate(geom, angle, origin='center', use_radians=False):
 
 
 def scale(geom, xfact=1.0, yfact=1.0, zfact=1.0, origin='center'):
-    """Returns a scaled geometry, scaled by factors along each dimension.
+    r"""Returns a scaled geometry, scaled by factors along each dimension.
 
     The point of origin can be a keyword 'center' for the 2D bounding box
     center (default), 'centroid' for the geometry's 2D centroid, a Point
@@ -200,7 +200,7 @@ def scale(geom, xfact=1.0, yfact=1.0, zfact=1.0, origin='center'):
 
 
 def skew(geom, xs=0.0, ys=0.0, origin='center', use_radians=False):
-    """Returns a skewed geometry, sheared by angles along x and y dimensions.
+    r"""Returns a skewed geometry, sheared by angles along x and y dimensions.
 
     The shear angle can be specified in either degrees (default) or radians
     by setting ``use_radians=True``.
@@ -239,7 +239,7 @@ def skew(geom, xs=0.0, ys=0.0, origin='center', use_radians=False):
 
 
 def translate(geom, xoff=0.0, yoff=0.0, zoff=0.0):
-    """Returns a translated geometry shifted by offsets along each dimension.
+    r"""Returns a translated geometry shifted by offsets along each dimension.
 
     The general 3D affine transformation matrix for translation is:
 

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/algorithms/cga.py

@@ -1,7 +1,7 @@
 
 def signed_area(ring):
-    """Return the signed area enclosed by a ring in linear time using the 
-    algorithm at: http://www.cgafaq.info/wiki/Polygon_Area.
+    """Return the signed area enclosed by a ring in linear time using the
+    algorithm at: https://web.archive.org/web/20080209143651/http://cgafaq.info:80/wiki/Polygon_Area
     """
     xs, ys = ring.coords.xy
     xs.append(xs[1])

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/algorithms/polylabel.py

@@ -87,7 +87,9 @@ def polylabel(polygon, tolerance=1.0):
     if not polygon.is_valid:
         raise TopologicalError('Invalid polygon')
     minx, miny, maxx, maxy = polygon.bounds
-    cell_size = min(maxx - minx, maxy - miny)
+    width = maxx - minx
+    height = maxy - miny
+    cell_size = min(width, height)
     h = cell_size / 2.0
     cell_queue = []
 
@@ -96,6 +98,11 @@ def polylabel(polygon, tolerance=1.0):
     x, y = polygon.centroid.coords[0]
     best_cell = Cell(x, y, 0, polygon)
 
+    # Special case for rectangular polygons avoiding floating point error
+    bbox_cell = Cell(minx + width / 2.0, miny + height / 2, 0, polygon)
+    if bbox_cell.distance > best_cell.distance:
+        best_cell = bbox_cell
+
     # build a regular square grid covering the polygon
     x = minx
     while x < maxx:

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/ctypes_declarations.py

@@ -509,3 +509,10 @@ def prototype(lgeos, geos_version):
 
         lgeos.GEOSSTRtree_destroy.argtypes = [c_void_p]
         lgeos.GEOSSTRtree_destroy.restype = None
+    
+    if geos_version >= (3, 6, 0):
+        lgeos.GEOSDistanceCallback = CFUNCTYPE(c_int, c_void_p, c_void_p, c_void_p, c_void_p)
+
+        lgeos.GEOSSTRtree_nearest_generic.argtypes = [
+            c_void_p, py_object, c_void_p, lgeos.GEOSDistanceCallback, py_object]
+        lgeos.GEOSSTRtree_nearest_generic.restype = c_void_p

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/examples/dissolve.py

@@ -9,7 +9,7 @@ import random
 import pylab
 
 from shapely.geometry import Point
-from shapely.ops import cascaded_union
+from shapely.ops import unary_union
 
 # Use a partial function to make 100 points uniformly distributed in a 40x40 
 # box centered on 0,0.
@@ -19,9 +19,9 @@ 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 
+# Perform a unary union of the polygon spots, dissolving them into a
 # collection of polygon patches
-patches = cascaded_union(spots)
+patches = unary_union(spots)
 
 if __name__ == "__main__":
     # Illustrate the results using matplotlib's pylab interface

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/examples/intersect.py

@@ -9,13 +9,13 @@ import random
 import pylab
 
 from shapely.geometry import LineString, Point
-from shapely.ops import cascaded_union
+from shapely.ops import unary_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)
+patches = unary_union(spots)
 
 # Represent the following geolocation parameters
 #

{Shapely-1.7a1 → Shapely-1.7a2}/shapely/geometry/base.py

@@ -12,11 +12,11 @@ from itertools import islice
 import math
 import sys
 from warnings import warn
+from functools import wraps
 
 from shapely.affinity import affine_transform
 from shapely.coords import CoordinateSequence
 from shapely.errors import WKBReadingError, WKTReadingError
-from shapely.ftools import wraps
 from shapely.geos import WKBWriter, WKTWriter
 from shapely.geos import lgeos
 from shapely.impl import DefaultImplementation, delegated
@@ -565,9 +565,9 @@ class BaseGeometry(object):
           3.1415138011443009
           >>> g.buffer(1.0, 3).area     # triangle approximation
           3.0
-          >>> list(g.buffer(1.0, cap_style='square').exterior.coords)
+          >>> list(g.buffer(1.0, cap_style=CAP_STYLE.square).exterior.coords)
           [(1.0, 1.0), (1.0, -1.0), (-1.0, -1.0), (-1.0, 1.0), (1.0, 1.0)]
-          >>> g.buffer(1.0, cap_style='square').area
+          >>> g.buffer(1.0, cap_style=CAP_STYLE.square).area
           4.0
         """
         if quadsegs is not None:
@@ -764,6 +764,7 @@ class BaseGeometry(object):
         return op(self, other)
 
     @delegated
+    @exceptNull
     def interpolate(self, distance, normalized=False):
         """Return a point at the specified distance along a linear geometry