Fix shapely deprecation warnings (#85)

* Fix shapely deprecation warnings

* Minor changes

Author: ianthomas23

.github/workflows/build.yml renamed to .github/workflows/build.yaml

@@ -7,7 +7,7 @@
         'codecov',
         'flake8',
         'hilbertcurve',
-        'geopandas-base',
+        'geopandas',
         'hypothesis',
         'pytest-cov',
         'pytest',

.github/workflows/test.yml renamed to .github/workflows/test.yaml

@@ -146,8 +146,10 @@ def invalid_array():
                         pass
                     elif isinstance(el, GeometryFixed):
                         array[i] = el.flat_values.tobytes()
-                    else:
+                    elif isinstance(el, list) or isinstance(el, np.ndarray):
                         array[i] = np.asarray(el, dtype=numpy_dtype).tobytes()
+                    else:
+                        array[i] = np.asarray(el.coords, dtype=numpy_dtype).tobytes()
             else:
                 if dtype:
                     array = array.astype(dtype)

setup.py

@@ -30,7 +30,7 @@ def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
         if isinstance(shape, (sg.LineString, sg.LinearRing)):
             # Single line
-            return np.asarray(shape.ctypes)
+            return np.asarray(shape.coords).ravel()
         else:
             raise ValueError("""
 Received invalid value of type {typ}. Must be an instance of LineString

spatialpandas/geometry/basefixed.py

@@ -31,17 +31,17 @@ def construct_array_type(cls):
     def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
         if isinstance(shape, sg.MultiLineString):
-            shape = list(shape)
+            shape = shape.geoms
             line_parts = []
             if len(shape) == 0:
                 # Add single empty line so we have the right number of nested levels
                 line_parts.append([])
             else:
                 for line in shape:
-                    line_parts.append(np.asarray(line.ctypes))
+                    line_parts.append(np.asarray(line.coords).ravel())
             return line_parts
         elif isinstance(shape, (sg.LineString, sg.LinearRing)):
-            return [np.asarray(shape.ctypes)]
+            return [np.asarray(shape.coords).ravel()]
         else:
             raise ValueError("""
 Received invalid value of type {typ}. Must be an instance of MultiLineString

spatialpandas/geometry/line.py

@@ -27,9 +27,10 @@ def construct_array_type(cls):
     @classmethod
     def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
-        if isinstance(shape, (sg.Point, sg.MultiPoint)):
-            # Single line
-            return np.asarray(shape.ctypes)
+        if isinstance(shape, sg.Point):
+            return np.asarray(shape.coords).ravel()
+        elif isinstance(shape, sg.MultiPoint):
+            return np.hstack([g.coords for g in shape.geoms]).ravel()
         else:
             raise ValueError("""
 Received invalid value of type {typ}. Must be an instance of Point,

spatialpandas/geometry/multiline.py

@@ -39,7 +39,7 @@ def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
         if isinstance(shape, sg.MultiPolygon):
             multipolygon = []
-            for polygon in shape:
+            for polygon in shape.geoms:
                 polygon_coords = Polygon._shapely_to_coordinates(polygon)
                 multipolygon.append(polygon_coords)
 
@@ -93,7 +93,7 @@ def from_shapely(cls, shape, orient=True):
             if isinstance(shape, sg.Polygon):
                 shape = sg.polygon.orient(shape)
             elif isinstance(shape, sg.MultiPolygon):
-                shape = sg.MultiPolygon([sg.polygon.orient(poly) for poly in shape])
+                shape = sg.MultiPolygon([sg.polygon.orient(poly) for poly in shape.geoms])
 
         shape_parts = cls._shapely_to_coordinates(shape)
         return cls(shape_parts)

spatialpandas/geometry/multipoint.py

@@ -28,7 +28,7 @@ def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
         if isinstance(shape, sg.Point):
             # Single point
-            return np.asarray(shape.ctypes)
+            return np.asarray(shape.coords).ravel()
         else:
             raise ValueError("""
 Received invalid value of type {typ}. Must be an instance of Point,

spatialpandas/geometry/multipolygon.py

@@ -38,12 +38,12 @@ def _shapely_to_coordinates(cls, shape):
         import shapely.geometry as sg
         if isinstance(shape, sg.Polygon):
             if shape.exterior is not None:
-                exterior = np.asarray(shape.exterior.ctypes)
+                exterior = np.asarray(shape.exterior.coords).ravel()
                 polygon_coords = [exterior]
             else:
                 polygon_coords = [np.array([])]
             for ring in shape.interiors:
-                interior = np.asarray(ring.ctypes)
+                interior = np.asarray(ring.coords).ravel()
                 polygon_coords.append(interior)
 
             return polygon_coords