shapely 1.8.3__tar.gz → 1.8.4__tar.gz

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

@@ -1,6 +1,13 @@
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
 1.8.3 (2022-08-16)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.3
+Version: 1.8.4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -331,6 +331,13 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
 1.8.3 (2022-08-16)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.3
+Version: 1.8.4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -331,6 +331,13 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
 1.8.3 (2022-08-16)
 ------------------
 

Shapely-1.8.4/VERSION.txt

@@ -0,0 +1 @@
+1.8.4

Shapely-1.8.4/shapely/__init__.py

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

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

@@ -3,19 +3,8 @@
 See header file: geos-x.y.z/capi/geos_c.h
 '''
 
-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 ctypes import CFUNCTYPE, POINTER, c_void_p, c_char_p, \
+    c_size_t, c_byte, c_uint, c_int, c_double, py_object
 
 from .errors import UnsupportedGEOSVersionError
 
@@ -31,13 +20,6 @@ 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
 
@@ -173,25 +155,25 @@ def prototype(lgeos, geos_version):
 
     # Geometry constructors
 
-    lgeos.GEOSGeom_createPoint.restype = c_geom_p
+    lgeos.GEOSGeom_createPoint.restype = c_void_p
     lgeos.GEOSGeom_createPoint.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createLinearRing.restype = c_geom_p
+    lgeos.GEOSGeom_createLinearRing.restype = c_void_p
     lgeos.GEOSGeom_createLinearRing.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createLineString.restype = c_geom_p
+    lgeos.GEOSGeom_createLineString.restype = c_void_p
     lgeos.GEOSGeom_createLineString.argtypes = [c_void_p]
 
-    lgeos.GEOSGeom_createPolygon.restype = c_geom_p
-    lgeos.GEOSGeom_createPolygon.argtypes = [c_geom_p, POINTER(c_geom_p), c_uint]
+    lgeos.GEOSGeom_createPolygon.restype = c_void_p
+    lgeos.GEOSGeom_createPolygon.argtypes = [c_void_p, 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_createCollection.restype = c_void_p
+    lgeos.GEOSGeom_createCollection.argtypes = [c_int, c_void_p, c_uint]
 
-    lgeos.GEOSGeom_createEmptyCollection.restype = c_geom_p
+    lgeos.GEOSGeom_createEmptyCollection.restype = c_void_p
     lgeos.GEOSGeom_createEmptyCollection.argtypes = [c_int]
 
-    lgeos.GEOSGeom_clone.restype = c_geom_p
+    lgeos.GEOSGeom_clone.restype = c_void_p
     lgeos.GEOSGeom_clone.argtypes = [c_void_p]
 
     # Memory management
@@ -243,13 +225,9 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSPolygonize.restype = c_void_p
     lgeos.GEOSPolygonize.argtypes = [c_void_p, c_uint]
 
-    lgeos.GEOSPolygonize_full.restype = c_geom_p
+    lgeos.GEOSPolygonize_full.restype = c_void_p
     lgeos.GEOSPolygonize_full.argtypes = [
-        c_geom_p,
-        POINTER(c_geom_p),
-        POINTER(c_geom_p),
-        POINTER(c_geom_p),
-    ]
+        c_void_p, c_void_p, c_void_p, c_void_p]
 
     if geos_version >= (3, 4, 0):
         lgeos.GEOSDelaunayTriangulation.restype = c_void_p
@@ -419,16 +397,16 @@ def prototype(lgeos, geos_version):
     # Misc functions
 
     lgeos.GEOSArea.restype = c_int
-    lgeos.GEOSArea.argtypes = [c_geom_p, POINTER(c_double)]
+    lgeos.GEOSArea.argtypes = [c_void_p, POINTER(c_double)]
 
     lgeos.GEOSLength.restype = c_int
-    lgeos.GEOSLength.argtypes = [c_geom_p, POINTER(c_double)]
+    lgeos.GEOSLength.argtypes = [c_void_p, POINTER(c_double)]
 
     lgeos.GEOSDistance.restype = c_int
-    lgeos.GEOSDistance.argtypes = [c_geom_p, c_geom_p, POINTER(c_double)]
+    lgeos.GEOSDistance.argtypes = [c_void_p, c_void_p, POINTER(c_double)]
 
     lgeos.GEOSHausdorffDistance.restype = c_int
-    lgeos.GEOSHausdorffDistance.argtypes = [c_geom_p, c_geom_p, POINTER(c_double)]
+    lgeos.GEOSHausdorffDistance.argtypes = [c_void_p, c_void_p, POINTER(c_double)]
 
     # Reader and Writer APIs
 
@@ -546,7 +524,7 @@ 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_geom_p, POINTER(c_double)]
+        lgeos.GEOSMinimumClearance.argtypes = [c_void_p, POINTER(c_double)]
         lgeos.GEOSMinimumClearance.restype = c_int
 
     if geos_version >= (3, 8, 0):

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

@@ -7,7 +7,7 @@ different z values may intersect or be equal.
 """
 
 from binascii import a2b_hex
-from ctypes import cast, pointer, c_size_t, c_char_p, c_void_p
+from ctypes import pointer, c_size_t, c_char_p, c_void_p
 from itertools import islice
 import logging
 import math
@@ -18,7 +18,6 @@ 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
@@ -108,11 +107,10 @@ 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(geom_ptr)
+        geom = lgeos.GEOSGeom_clone(ob._geom)
     else:
-        cs = lgeos.GEOSGeom_getCoordSeq(geom_ptr)
+        cs = lgeos.GEOSGeom_getCoordSeq(ob._geom)
         cs = lgeos.GEOSCoordSeq_clone(cs)
         geom = create_func(cs)
 

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

@@ -3,7 +3,6 @@
 
 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
@@ -64,7 +63,7 @@ def geos_geometrycollection_from_py(ob):
          ob = ob.geoms
     L = len(ob)
     N = 2
-    subs = (c_geom_p * L)()
+    subs = (c_void_p * L)()
     for l in range(L):
         assert(isinstance(ob[l], BaseGeometry))
         if ob[l].has_z:

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

@@ -4,7 +4,6 @@
 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
@@ -117,9 +116,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)
 
@@ -135,8 +134,8 @@ def geos_multilinestring_from_py(ob):
         raise ValueError("Invalid coordinate dimensionality")
 
     # Array of pointers to point geometries
-    subs = (c_geom_p * L)()
-
+    subs = (c_void_p * L)()
+    
     # add to coordinate sequence
     for l in range(L):
         geom, ndims = linestring.geos_linestring_from_py(obs[l])
@@ -144,6 +143,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_geom_p)
-
+        subs[l] = cast(geom, c_void_p)
+            
     return (lgeos.GEOSGeom_createCollection(5, subs, L), N)

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

@@ -4,7 +4,6 @@
 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 (
@@ -195,7 +194,7 @@ def geos_multipoint_from_py(ob):
     assert n == 2 or n == 3
 
     # Array of pointers to point geometries
-    subs = (c_geom_p * m)()
+    subs = (c_void_p * m)()
 
     # add to coordinate sequence
     for i in range(m):
@@ -205,6 +204,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_geom_p)
+        subs[i] = cast(geom, c_void_p)
 
     return lgeos.GEOSGeom_createCollection(4, subs, m), n

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

@@ -4,7 +4,6 @@
 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
@@ -147,10 +146,10 @@ def geos_multipolygon_from_py(ob):
     N = len(ob[0][0][0])
     assert N == 2 or N == 3
 
-    subs = (c_geom_p * L)()
+    subs = (c_void_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_geom_p)
+        subs[l] = cast(geom, c_void_p)
 
     return (lgeos.GEOSGeom_createCollection(6, subs, L), N)
 
@@ -193,7 +192,7 @@ def geos_multipolygon_from_polygons(arg):
 
     assert N == 2 or N == 3
 
-    subs = (c_geom_p * L)()
+    subs = (c_void_p * L)()
 
     for i, ob in enumerate(obs):
         if isinstance(ob, polygon.Polygon):
@@ -204,6 +203,6 @@ def geos_multipolygon_from_polygons(arg):
             holes = ob[1]
 
         geom, ndims = polygon.geos_polygon_from_py(shell, holes)
-        subs[i] = cast(geom, c_geom_p)
+        subs[i] = cast(geom, c_void_p)
 
     return (lgeos.GEOSGeom_createCollection(6, subs, L), N)

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

@@ -9,7 +9,6 @@ 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
@@ -556,17 +555,16 @@ def geos_polygon_from_py(shell, holes=None):
                 raise ValueError("insufficiant coordinate dimension")
 
             # Array of pointers to ring geometries
-            geos_holes = (c_geom_p * L)()
+            geos_holes = (c_void_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_geom_p)
+                geos_holes[l] = cast(geom, c_void_p)
         else:
-            geos_holes = POINTER(c_geom_p)()
+            geos_holes = POINTER(c_void_p)()
             L = 0
 
         return (
-            lgeos.GEOSGeom_createPolygon(cast(geos_shell, c_geom_p), geos_holes, L),
-            ndim,
-        )
+            lgeos.GEOSGeom_createPolygon(
+                c_void_p(geos_shell), geos_holes, L), ndim)

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

@@ -1,10 +1,9 @@
 """Support for various GEOS geometry operations
 """
 
-from ctypes import byref, cast, c_void_p, c_double
+from ctypes import byref, 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
@@ -45,16 +44,12 @@ class CollectionOperator:
             source = [source]
         finally:
             obs = [self.shapeup(l) for l in source]
-
-        geom_array_type = c_geom_p * len(obs)
+        geom_array_type = c_void_p * len(obs)
         geom_array = geom_array_type()
-
         for i, line in enumerate(obs):
-            geom_array[i] = cast(line._geom, c_geom_p)
-
+            geom_array[i] = line._geom
         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)
@@ -83,21 +78,16 @@ class CollectionOperator:
             source = [source]
         finally:
             obs = [self.shapeup(l) for l in source]
-
         L = len(obs)
-        subs = (c_geom_p * L)()
-
+        subs = (c_void_p * L)()
         for i, g in enumerate(obs):
-            subs[i] = cast(g._geom, c_geom_p)
-
+            subs[i] = g._geom
         collection = lgeos.GEOSGeom_createCollection(5, subs, L)
-        dangles = c_geom_p()
-        cuts = c_geom_p()
-        invalids = c_geom_p()
+        dangles = c_void_p()
+        cuts = c_void_p()
+        invalids = c_void_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),
@@ -145,12 +135,9 @@ class CollectionOperator:
         except TypeError:
             geoms = [geoms]
             L = 1
-
-        subs = (c_geom_p * L)()
-
+        subs = (c_void_p * L)()
         for i, g in enumerate(geoms):
-            subs[i] = cast(g._geom, c_geom_p)
-
+            subs[i] = g._geom
         collection = lgeos.GEOSGeom_createCollection(6, subs, L)
         return geom_factory(lgeos.methods['cascaded_union'](collection))
 
@@ -167,12 +154,9 @@ class CollectionOperator:
         except TypeError:
             geoms = [geoms]
             L = 1
-
-        subs = (c_geom_p * L)()
-
+        subs = (c_void_p * L)()
         for i, g in enumerate(geoms):
-            subs[i] = cast(g._geom, c_geom_p)
-
+            subs[i] = g._geom
         collection = lgeos.GEOSGeom_createCollection(6, subs, L)
         return geom_factory(lgeos.methods['unary_union'](collection))
 

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

@@ -24,7 +24,6 @@ from typing import Any, ItemsView, Iterable, Iterator, Optional, Sequence, Tuple
 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
@@ -264,8 +263,8 @@ class STRtree:
                     dist[0] = sys.float_info.max
                 else:
                     lgeos.GEOSDistance(
-                        ctypes.cast(self._geoms[idx]._geom, c_geom_p),
-                        ctypes.cast(geom2._geom, c_geom_p),
+                        self._geoms[idx]._geom,
+                        geom2._geom,
                         dist,
                     )
                 return 1

{Shapely-1.8.3 → Shapely-1.8.4}/shapely/topology.py

@@ -9,7 +9,6 @@ These methods return ctypes objects that should be recast by the caller.
 
 from ctypes import byref, cast, c_double
 
-from shapely.ctypes_declarations import c_geom_p
 from shapely.geos import TopologicalError, lgeos
 from shapely.errors import InvalidGeometryError
 
@@ -49,9 +48,7 @@ class BinaryRealProperty(Delegating):
         self._validate(this)
         self._validate(other, stop_prepared=True)
         d = c_double()
-        retval = self.fn(
-            cast(this._geom, c_geom_p), cast(other._geom, c_geom_p), byref(d)
-        )
+        retval = self.fn(this._geom, other._geom, byref(d))
         return d.value
 
 
@@ -60,7 +57,7 @@ class UnaryRealProperty(Delegating):
     def __call__(self, this):
         self._validate(this)
         d = c_double()
-        retval = self.fn(cast(this._geom, c_geom_p), byref(d))
+        retval = self.fn(this._geom, byref(d))
         return d.value
 
 

Shapely-1.8.3/VERSION.txt

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

Shapely-1.8.3/shapely/__init__.py

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