Merge pull request #18 from ungarj/release_2022.6.0

Release 2022.6.0

label_centerlines/__init__.py

@@ -3,7 +3,7 @@
 from ._src import get_centerline
 
 
-__version__ = "0.2"
+__version__ = "2022.6.0"
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

label_centerlines/_src.py

@@ -5,7 +5,7 @@
 import numpy as np
 import operator
 from scipy.spatial import Voronoi
-from scipy.ndimage import filters
+from scipy.ndimage import gaussian_filter1d
 from shapely.geometry import LineString, MultiLineString, Point, MultiPoint
 
 from label_centerlines.exceptions import CenterlineError
@@ -100,10 +100,10 @@ def get_centerline(
         return centerline
 
     elif geom.geom_type == "MultiPolygon":
-        logger.debug("MultiPolygon found with %s sub-geometries", len(geom))
+        logger.debug("MultiPolygon found with %s sub-geometries", len(geom.geoms))
         # get centerline for each part Polygon and combine into MultiLineString
         sub_centerlines = []
-        for subgeom in geom:
+        for subgeom in geom.geoms:
             try:
                 sub_centerline = get_centerline(
                     subgeom, segmentize_maxlen, max_points, simplification, smooth_sigma
@@ -148,8 +148,8 @@ def _smooth_linestring(linestring, smooth_sigma):
     """Use a gauss filter to smooth out the LineString coordinates."""
     return LineString(
         zip(
-            np.array(filters.gaussian_filter1d(linestring.xy[0], smooth_sigma)),
-            np.array(filters.gaussian_filter1d(linestring.xy[1], smooth_sigma)),
+            np.array(gaussian_filter1d(linestring.xy[0], smooth_sigma)),
+            np.array(gaussian_filter1d(linestring.xy[1], smooth_sigma)),
         )
     )
 

label_centerlines/cli.py

@@ -164,5 +164,5 @@ def _feature_worker(
     elif centerline.geom_type == "MultiLineString":
         return [
             (dict(feature, geometry=mapping(subgeom)), elapsed)
-            for subgeom in centerline
+            for subgeom in centerline.geoms
         ]

test/conftest.py

@@ -9,4 +9,4 @@
 @pytest.fixture
 def alps_shape():
     with fiona.open(os.path.join(TESTDATA_DIR, "alps.geojson"), "r") as src:
-        return shape(next(src)["geometry"])
+        return shape(next(iter(src))["geometry"])