shapely 1.8.2__tar.gz → 1.8.3__tar.gz

{Shapely-1.8.2 → Shapely-1.8.3}/CHANGES.txt

@@ -1,6 +1,31 @@
 Changes
 =======
 
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -23,7 +48,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).

{Shapely-1.8.2/Shapely.egg-info → Shapely-1.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.2
+Version: 1.8.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -9,7 +9,6 @@ Maintainer: Sean Gillies
 Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Keywords: geometry topology gis
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -332,6 +331,31 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -354,7 +378,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).
@@ -1224,5 +1248,3 @@ TODO: fill gap here
 1.0 RC1 (2008-01-14)
 --------------------
 - First release candidate
-
-

{Shapely-1.8.2 → Shapely-1.8.3/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.2
+Version: 1.8.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -9,7 +9,6 @@ Maintainer: Sean Gillies
 Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Keywords: geometry topology gis
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -332,6 +331,31 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -354,7 +378,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).
@@ -1224,5 +1248,3 @@ TODO: fill gap here
 1.0 RC1 (2008-01-14)
 --------------------
 - First release candidate
-
-

Shapely-1.8.3/VERSION.txt

@@ -0,0 +1 @@
+1.8.3

Shapely-1.8.3/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "Cython>=0.29.24,<3",
+    "oldest-supported-numpy",
+    "setuptools<64",
+]

Shapely-1.8.3/shapely/__init__.py

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

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/ctypes_declarations.py

@@ -3,8 +3,19 @@
 See header file: geos-x.y.z/capi/geos_c.h
 '''
 
-from ctypes import CFUNCTYPE, POINTER, c_void_p, c_char_p, \
-    c_size_t, c_byte, c_uint, c_int, c_double, py_object
+from ctypes import (
+    CFUNCTYPE,
+    POINTER,
+    Structure,
+    c_void_p,
+    c_char_p,
+    c_size_t,
+    c_byte,
+    c_uint,
+    c_int,
+    c_double,
+    py_object,
+)
 
 from .errors import UnsupportedGEOSVersionError
 
@@ -20,6 +31,13 @@ class allocated_c_char_p(c_char_p):
     pass
 
 
+class GEOSGeom_t(Structure):
+    pass
+
+
+c_geom_p = POINTER(GEOSGeom_t)
+
+
 def prototype(lgeos, geos_version):
     """Protype functions in geos_c.h for different version of GEOS
 
@@ -132,6 +150,9 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSBufferParams_create.restype = c_void_p
     lgeos.GEOSBufferParams_create.argtypes = None
 
+    lgeos.GEOSBufferParams_destroy.restype = None
+    lgeos.GEOSBufferParams_destroy.argtypes = [c_void_p]
+
     lgeos.GEOSBufferParams_setEndCapStyle.restype = c_int
     lgeos.GEOSBufferParams_setEndCapStyle.argtypes = [c_void_p, c_int]
 
@@ -152,25 +173,25 @@ def prototype(lgeos, geos_version):
 
     # Geometry constructors
 
-    lgeos.GEOSGeom_createPoint.restype = c_void_p
+    lgeos.GEOSGeom_createPoint.restype = c_geom_p
     lgeos.GEOSGeom_createPoint.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createLinearRing.restype = c_void_p
+    lgeos.GEOSGeom_createLinearRing.restype = c_geom_p
     lgeos.GEOSGeom_createLinearRing.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createLineString.restype = c_void_p
+    lgeos.GEOSGeom_createLineString.restype = c_geom_p
     lgeos.GEOSGeom_createLineString.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createPolygon.restype = c_void_p
-    lgeos.GEOSGeom_createPolygon.argtypes = [c_void_p, c_void_p, c_uint]
+    lgeos.GEOSGeom_createPolygon.restype = c_geom_p
+    lgeos.GEOSGeom_createPolygon.argtypes = [c_geom_p, POINTER(c_geom_p), c_uint]
 
-    lgeos.GEOSGeom_createCollection.restype = c_void_p
-    lgeos.GEOSGeom_createCollection.argtypes = [c_int, c_void_p, c_uint]
+    lgeos.GEOSGeom_createCollection.restype = c_geom_p
+    lgeos.GEOSGeom_createCollection.argtypes = [c_int, POINTER(c_geom_p), c_uint]
 
-    lgeos.GEOSGeom_createEmptyCollection.restype = c_void_p
+    lgeos.GEOSGeom_createEmptyCollection.restype = c_geom_p
     lgeos.GEOSGeom_createEmptyCollection.argtypes = [c_int]
 
-    lgeos.GEOSGeom_clone.restype = c_void_p
+    lgeos.GEOSGeom_clone.restype = c_geom_p
     lgeos.GEOSGeom_clone.argtypes = [c_void_p]
 
     # Memory management
@@ -222,9 +243,13 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSPolygonize.restype = c_void_p
     lgeos.GEOSPolygonize.argtypes = [c_void_p, c_uint]
 
-    lgeos.GEOSPolygonize_full.restype = c_void_p
+    lgeos.GEOSPolygonize_full.restype = c_geom_p
     lgeos.GEOSPolygonize_full.argtypes = [
-        c_void_p, c_void_p, c_void_p, c_void_p]
+        c_geom_p,
+        POINTER(c_geom_p),
+        POINTER(c_geom_p),
+        POINTER(c_geom_p),
+    ]
 
     if geos_version >= (3, 4, 0):
         lgeos.GEOSDelaunayTriangulation.restype = c_void_p
@@ -393,17 +418,17 @@ def prototype(lgeos, geos_version):
 
     # Misc functions
 
-    lgeos.GEOSArea.restype = c_double
-    lgeos.GEOSArea.argtypes = [c_void_p, c_void_p]
+    lgeos.GEOSArea.restype = c_int
+    lgeos.GEOSArea.argtypes = [c_geom_p, POINTER(c_double)]
 
     lgeos.GEOSLength.restype = c_int
-    lgeos.GEOSLength.argtypes = [c_void_p, c_void_p]
+    lgeos.GEOSLength.argtypes = [c_geom_p, POINTER(c_double)]
 
     lgeos.GEOSDistance.restype = c_int
-    lgeos.GEOSDistance.argtypes = [c_void_p, c_void_p, c_void_p]
+    lgeos.GEOSDistance.argtypes = [c_geom_p, c_geom_p, POINTER(c_double)]
 
     lgeos.GEOSHausdorffDistance.restype = c_int
-    lgeos.GEOSHausdorffDistance.argtypes = [c_void_p, c_void_p, c_void_p]
+    lgeos.GEOSHausdorffDistance.argtypes = [c_geom_p, c_geom_p, POINTER(c_double)]
 
     # Reader and Writer APIs
 
@@ -521,8 +546,8 @@ def prototype(lgeos, geos_version):
             c_void_p, py_object, c_void_p, lgeos.GEOSDistanceCallback, py_object]
         lgeos.GEOSSTRtree_nearest_generic.restype = c_void_p
 
-        lgeos.GEOSMinimumClearance.argtypes = [c_void_p]
-        lgeos.GEOSMinimumClearance.restype = c_double
+        lgeos.GEOSMinimumClearance.argtypes = [c_geom_p, POINTER(c_double)]
+        lgeos.GEOSMinimumClearance.restype = c_int
 
     if geos_version >= (3, 8, 0):
         lgeos.GEOSMakeValid.restype = c_void_p

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/base.py

@@ -7,7 +7,7 @@ different z values may intersect or be equal.
 """
 
 from binascii import a2b_hex
-from ctypes import pointer, c_size_t, c_char_p, c_void_p
+from ctypes import cast, pointer, c_size_t, c_char_p, c_void_p
 from itertools import islice
 import logging
 import math
@@ -18,6 +18,7 @@ import warnings
 
 from shapely.affinity import affine_transform
 from shapely.coords import CoordinateSequence
+from shapely.ctypes_declarations import c_geom_p
 from shapely.errors import GeometryTypeError, WKBReadingError, WKTReadingError
 from shapely.errors import ShapelyDeprecationWarning
 from shapely.geos import WKBWriter, WKTWriter
@@ -107,10 +108,11 @@ def geos_geom_from_py(ob, create_func=None):
     This behaviour is useful for converting between LineString and LinearRing
     objects.
     """
+    geom_ptr = cast(ob._geom, c_geom_p)
     if create_func is None:
-        geom = lgeos.GEOSGeom_clone(ob._geom)
+        geom = lgeos.GEOSGeom_clone(geom_ptr)
     else:
-        cs = lgeos.GEOSGeom_getCoordSeq(ob._geom)
+        cs = lgeos.GEOSGeom_getCoordSeq(geom_ptr)
         cs = lgeos.GEOSCoordSeq_clone(cs)
         geom = create_func(cs)
 
@@ -625,12 +627,16 @@ class BaseGeometry:
 
         if 'buffer_with_params' in self.impl:
             params = self._lgeos.GEOSBufferParams_create()
-            self._lgeos.GEOSBufferParams_setEndCapStyle(params, cap_style)
-            self._lgeos.GEOSBufferParams_setJoinStyle(params, join_style)
-            self._lgeos.GEOSBufferParams_setMitreLimit(params, mitre_limit)
-            self._lgeos.GEOSBufferParams_setQuadrantSegments(params, res)
-            self._lgeos.GEOSBufferParams_setSingleSided(params, single_sided)
-            return geom_factory(self.impl['buffer_with_params'](self, params, distance))
+            try:
+                self._lgeos.GEOSBufferParams_setEndCapStyle(params, cap_style)
+                self._lgeos.GEOSBufferParams_setJoinStyle(params, join_style)
+                self._lgeos.GEOSBufferParams_setMitreLimit(params, mitre_limit)
+                self._lgeos.GEOSBufferParams_setQuadrantSegments(params, res)
+                self._lgeos.GEOSBufferParams_setSingleSided(params, single_sided)
+                return geom_factory(self.impl['buffer_with_params'](self, params, distance))
+            finally:
+                if params:
+                    self._lgeos.GEOSBufferParams_destroy(params)
 
         if cap_style == CAP_STYLE.round and join_style == JOIN_STYLE.round:
             return geom_factory(self.impl['buffer'](self, distance, res))

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/collection.py

@@ -3,6 +3,7 @@
 
 from ctypes import c_void_p
 
+from shapely.ctypes_declarations import c_geom_p
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry
 from shapely.geometry.base import BaseMultipartGeometry
@@ -63,7 +64,7 @@ def geos_geometrycollection_from_py(ob):
          ob = ob.geoms
     L = len(ob)
     N = 2
-    subs = (c_void_p * L)()
+    subs = (c_geom_p * L)()
     for l in range(L):
         assert(isinstance(ob[l], BaseGeometry))
         if ob[l].has_z:

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/multilinestring.py

@@ -4,6 +4,7 @@
 from ctypes import c_void_p, cast
 import warnings
 
+from shapely.ctypes_declarations import c_geom_p
 from shapely.errors import EmptyPartError, ShapelyDeprecationWarning
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseMultipartGeometry, geos_geom_from_py
@@ -116,9 +117,9 @@ def asMultiLineString(context):
 
 
 def geos_multilinestring_from_py(ob):
-    # ob must be either a MultiLineString, a sequence, or 
+    # ob must be either a MultiLineString, a sequence, or
     # array of sequences or arrays
-    
+
     if isinstance(ob, MultiLineString):
          return geos_geom_from_py(ob)
 
@@ -134,8 +135,8 @@ def geos_multilinestring_from_py(ob):
         raise ValueError("Invalid coordinate dimensionality")
 
     # Array of pointers to point geometries
-    subs = (c_void_p * L)()
-    
+    subs = (c_geom_p * L)()
+
     # add to coordinate sequence
     for l in range(L):
         geom, ndims = linestring.geos_linestring_from_py(obs[l])
@@ -143,6 +144,6 @@ def geos_multilinestring_from_py(ob):
         if lgeos.GEOSisEmpty(geom):
             raise EmptyPartError("Can't create MultiLineString with empty component")
 
-        subs[l] = cast(geom, c_void_p)
-            
+        subs[l] = cast(geom, c_geom_p)
+
     return (lgeos.GEOSGeom_createCollection(5, subs, L), N)

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/multipoint.py

@@ -4,6 +4,7 @@
 from ctypes import byref, c_double, c_void_p, cast
 import warnings
 
+from shapely.ctypes_declarations import c_geom_p
 from shapely.errors import EmptyPartError, ShapelyDeprecationWarning
 from shapely.geos import lgeos
 from shapely.geometry.base import (
@@ -194,7 +195,7 @@ def geos_multipoint_from_py(ob):
     assert n == 2 or n == 3
 
     # Array of pointers to point geometries
-    subs = (c_void_p * m)()
+    subs = (c_geom_p * m)()
 
     # add to coordinate sequence
     for i in range(m):
@@ -204,6 +205,6 @@ def geos_multipoint_from_py(ob):
         if lgeos.GEOSisEmpty(geom):
             raise EmptyPartError("Can't create MultiPoint with empty component")
 
-        subs[i] = cast(geom, c_void_p)
+        subs[i] = cast(geom, c_geom_p)
 
     return lgeos.GEOSGeom_createCollection(4, subs, m), n

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/multipolygon.py

@@ -4,6 +4,7 @@
 from ctypes import c_void_p, cast
 import warnings
 
+from shapely.ctypes_declarations import c_geom_p
 from shapely.errors import ShapelyDeprecationWarning
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseMultipartGeometry, geos_geom_from_py
@@ -146,10 +147,10 @@ def geos_multipolygon_from_py(ob):
     N = len(ob[0][0][0])
     assert N == 2 or N == 3
 
-    subs = (c_void_p * L)()
+    subs = (c_geom_p * L)()
     for l in range(L):
         geom, ndims = polygon.geos_polygon_from_py(ob[l][0], ob[l][1:])
-        subs[l] = cast(geom, c_void_p)
+        subs[l] = cast(geom, c_geom_p)
 
     return (lgeos.GEOSGeom_createCollection(6, subs, L), N)
 
@@ -192,7 +193,7 @@ def geos_multipolygon_from_polygons(arg):
 
     assert N == 2 or N == 3
 
-    subs = (c_void_p * L)()
+    subs = (c_geom_p * L)()
 
     for i, ob in enumerate(obs):
         if isinstance(ob, polygon.Polygon):
@@ -203,6 +204,6 @@ def geos_multipolygon_from_polygons(arg):
             holes = ob[1]
 
         geom, ndims = polygon.geos_polygon_from_py(shell, holes)
-        subs[i] = cast(geom, c_void_p)
+        subs[i] = cast(geom, c_geom_p)
 
     return (lgeos.GEOSGeom_createCollection(6, subs, L), N)

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/polygon.py

@@ -9,6 +9,7 @@ import weakref
 
 from shapely.algorithms.cga import signed_area
 from shapely.coords import CoordinateSequence
+from shapely.ctypes_declarations import c_geom_p
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry, geos_geom_from_py
 from shapely.geometry.linestring import LineString, LineStringAdapter
@@ -555,16 +556,17 @@ def geos_polygon_from_py(shell, holes=None):
                 raise ValueError("insufficiant coordinate dimension")
 
             # Array of pointers to ring geometries
-            geos_holes = (c_void_p * L)()
+            geos_holes = (c_geom_p * L)()
 
             # add to coordinate sequence
             for l in range(L):
                 geom, ndim = geos_linearring_from_py(ob[l])
-                geos_holes[l] = cast(geom, c_void_p)
+                geos_holes[l] = cast(geom, c_geom_p)
         else:
-            geos_holes = POINTER(c_void_p)()
+            geos_holes = POINTER(c_geom_p)()
             L = 0
 
         return (
-            lgeos.GEOSGeom_createPolygon(
-                c_void_p(geos_shell), geos_holes, L), ndim)
+            lgeos.GEOSGeom_createPolygon(cast(geos_shell, c_geom_p), geos_holes, L),
+            ndim,
+        )

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/geometry/proxy.py

@@ -34,14 +34,17 @@ class CachingGeometryProxy:
                 self.__geom__, n = self.factory(self.context)
         self._gtag = gtag
         return self.__geom__
-        
+
     def gtag(self):
         return hash(repr(self.context))
 
     def __setattr__(self, name, value):
         # to override the custom one in BaseGeometry, so we don't warn
         # for the proxy classes, which are already deprecated itself
-        object.__setattr__(self, name, value)
+        try:
+            object.__setattr__(self, name, value)
+        except AttributeError:
+            pass
 
 
 class PolygonProxy(CachingGeometryProxy):

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/ops.py

@@ -1,9 +1,10 @@
 """Support for various GEOS geometry operations
 """
 
-from ctypes import byref, c_void_p, c_double
+from ctypes import byref, cast, c_void_p, c_double
 from warnings import warn
 
+from shapely.ctypes_declarations import c_geom_p
 from shapely.errors import GeometryTypeError, ShapelyDeprecationWarning
 from shapely.prepared import prep
 from shapely.geos import lgeos
@@ -44,12 +45,16 @@ class CollectionOperator:
             source = [source]
         finally:
             obs = [self.shapeup(l) for l in source]
-        geom_array_type = c_void_p * len(obs)
+
+        geom_array_type = c_geom_p * len(obs)
         geom_array = geom_array_type()
+
         for i, line in enumerate(obs):
-            geom_array[i] = line._geom
+            geom_array[i] = cast(line._geom, c_geom_p)
+
         product = lgeos.GEOSPolygonize(byref(geom_array), len(obs))
         collection = geom_factory(product)
+
         for g in collection.geoms:
             clone = lgeos.GEOSGeom_clone(g._geom)
             g = geom_factory(clone)
@@ -78,16 +83,21 @@ class CollectionOperator:
             source = [source]
         finally:
             obs = [self.shapeup(l) for l in source]
+
         L = len(obs)
-        subs = (c_void_p * L)()
+        subs = (c_geom_p * L)()
+
         for i, g in enumerate(obs):
-            subs[i] = g._geom
+            subs[i] = cast(g._geom, c_geom_p)
+
         collection = lgeos.GEOSGeom_createCollection(5, subs, L)
-        dangles = c_void_p()
-        cuts = c_void_p()
-        invalids = c_void_p()
+        dangles = c_geom_p()
+        cuts = c_geom_p()
+        invalids = c_geom_p()
         product = lgeos.GEOSPolygonize_full(
-            collection, byref(dangles), byref(cuts), byref(invalids))
+            collection, byref(dangles), byref(cuts), byref(invalids)
+        )
+
         return (
             geom_factory(product),
             geom_factory(dangles),
@@ -135,9 +145,12 @@ class CollectionOperator:
         except TypeError:
             geoms = [geoms]
             L = 1
-        subs = (c_void_p * L)()
+
+        subs = (c_geom_p * L)()
+
         for i, g in enumerate(geoms):
-            subs[i] = g._geom
+            subs[i] = cast(g._geom, c_geom_p)
+
         collection = lgeos.GEOSGeom_createCollection(6, subs, L)
         return geom_factory(lgeos.methods['cascaded_union'](collection))
 
@@ -154,9 +167,12 @@ class CollectionOperator:
         except TypeError:
             geoms = [geoms]
             L = 1
-        subs = (c_void_p * L)()
+
+        subs = (c_geom_p * L)()
+
         for i, g in enumerate(geoms):
-            subs[i] = g._geom
+            subs[i] = cast(g._geom, c_geom_p)
+
         collection = lgeos.GEOSGeom_createCollection(6, subs, L)
         return geom_factory(lgeos.methods['unary_union'](collection))
 

{Shapely-1.8.2 → Shapely-1.8.3}/shapely/strtree.py

@@ -22,7 +22,10 @@ import ctypes
 import logging
 from typing import Any, ItemsView, Iterable, Iterator, Optional, Sequence, Tuple, Union
 import sys
+from warnings import warn
 
+from shapely.ctypes_declarations import c_geom_p
+from shapely.errors import ShapelyDeprecationWarning
 from shapely.geometry.base import BaseGeometry
 from shapely.geos import lgeos
 
@@ -97,6 +100,19 @@ class STRtree:
         items: Iterable[Any] = None,
         node_capacity: int = 10,
     ):
+        if items is not None:
+            warn(
+                "STRtree will be changed in 2.0.0 and will not be compatible with versions < 2. "
+                "Specifically: the items keyword argument will be removed.",
+                ShapelyDeprecationWarning,
+                stacklevel=2,
+            )
+        else:
+            warn(
+                "STRtree will be changed in 2.0.0 and will not be compatible with versions < 2.",
+                ShapelyDeprecationWarning,
+                stacklevel=2,
+            )
         self.node_capacity = node_capacity
 
         # Keep references to geoms
@@ -247,8 +263,11 @@ class STRtree:
                 if callback_userdata["exclusive"] and self._geoms[idx].equals(geom2):
                     dist[0] = sys.float_info.max
                 else:
-                    lgeos.GEOSDistance(self._geoms[idx]._geom, geom2._geom, dist)
-                
+                    lgeos.GEOSDistance(
+                        ctypes.cast(self._geoms[idx]._geom, c_geom_p),
+                        ctypes.cast(geom2._geom, c_geom_p),
+                        dist,
+                    )
                 return 1
             except Exception:
                 log.exception("Caught exception")