ssb-sgis 1.1.15__tar.gz → 1.1.17__tar.gz

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.1.15
+Version: 1.1.17
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.1.15"
+version = "1.1.17"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/src/sgis/geopandas_tools/cleaning.py

@@ -480,7 +480,9 @@ def _dissolve_thick_double_and_update(gdf, double, thin_double):
         .pipe(update_geometries, geom_type="polygon")
     )
     return (
-        clean_overlay(gdf, large, how="update").pipe(sort_small_first)
+        clean_overlay(gdf, large, how="update", geom_type="polygon").pipe(
+            sort_small_first
+        )
         # .sort_values("_poly_idx")
         .pipe(update_geometries, geom_type="polygon")
     )
@@ -601,6 +603,7 @@ def split_by_neighbors(df, split_by, tolerance, grid_size=None) -> GeoDataFrame:
             buff(df, tolerance),
             how="identity",
             grid_size=grid_size,
+            geom_type="polygon",
         )
         .pipe(get_line_segments)
         .reset_index(drop=True)
@@ -621,7 +624,9 @@ def split_by_neighbors(df, split_by, tolerance, grid_size=None) -> GeoDataFrame:
 
     buffered = buff(extended_lines, tolerance, single_sided=True)
 
-    return clean_overlay(df, buffered, how="identity", grid_size=grid_size)
+    return clean_overlay(
+        df, buffered, how="identity", geom_type="polygon", grid_size=grid_size
+    )
 
 
 def extend_lines(arr1, arr2, distance) -> NDArray[LineString]:

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/src/sgis/geopandas_tools/duplicates.py

@@ -98,6 +98,9 @@ def update_geometries(
     if len(gdf) <= 1:
         return gdf
 
+    if geom_type == "polygon" or get_geom_type(gdf) == "polygon":
+        gdf.geometry = gdf.buffer(0)
+
     copied = make_all_singlepart(clean_geoms(gdf))
 
     copied, geom_type, keep_geom_type = _determine_geom_type_args(

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/src/sgis/geopandas_tools/overlay.py

@@ -119,6 +119,11 @@ def clean_overlay(
                 df1.geometry.geom_type.value_counts(),
             )
 
+    if geom_type == "polygon" or get_geom_type(df1) == "polygon":
+        df1.geometry = df1.buffer(0)
+    if geom_type == "polygon" or get_geom_type(df2) == "polygon":
+        df2.geometry = df2.buffer(0)
+
     df1 = clean_geoms(df1)
     df2 = clean_geoms(df2)
 
@@ -131,10 +136,14 @@ def clean_overlay(
     if geom_type and get_geom_type(df1) == get_geom_type(df2):
         df2 = to_single_geom_type(df2, geom_type)
 
-    assert df1.is_valid.all(), df1.is_valid.value_counts()
-    assert df2.is_valid.all(), df2.is_valid.value_counts()
-    assert df1.geometry.notna().all()
-    assert df2.geometry.notna().all()
+    assert df1.is_valid.all(), [
+        geom.wkt for geom in df1[lambda x: x.is_valid == False].geometry
+    ]
+    assert df2.is_valid.all(), [
+        geom.wkt for geom in df2[lambda x: x.is_valid == False].geometry
+    ]
+    assert df1.geometry.notna().all(), df1[lambda x: x.isna()]
+    assert df2.geometry.notna().all(), df2[lambda x: x.isna()]
 
     box1 = box(*df1.total_bounds)
     box2 = box(*df2.total_bounds)

{ssb_sgis-1.1.15 → ssb_sgis-1.1.17}/src/sgis/maps/maps.py

@@ -164,7 +164,7 @@ def explore(
 
     mask = kwargs.pop("mask", loc_mask)
 
-    if mask is not None:
+    if mask is not None and center is None:
         return clipmap(
             *gdfs,
             column=column,