ssb-sgis 1.1.15__py3-none-any.whl → 1.1.17__py3-none-any.whl

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]:

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(

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)

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,

{ssb_sgis-1.1.15.dist-info → ssb_sgis-1.1.17.dist-info}/METADATA

@@ -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.dist-info → ssb_sgis-1.1.17.dist-info}/RECORD

@@ -6,14 +6,14 @@ sgis/geopandas_tools/__init__.py,sha256=bo8lFMcltOz7TtWAi52_ekR2gd3mjfBfKeMDV5zu
 sgis/geopandas_tools/bounds.py,sha256=YJyF0gp78hFAjLLZmDquRKCBAtbt7QouG3snTcJeNQs,23822
 sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=t9GJqRMDsHEU74RIlqeMr4QBgbTK0hYlXL4af1RKIks,19955
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
-sgis/geopandas_tools/cleaning.py,sha256=0j7_bfuAjWVBUImbPTXuwNdYRJ_By6HAwaOdw5Dh4vc,24315
+sgis/geopandas_tools/cleaning.py,sha256=PkAVVZ84ahek8_uVlTRtCO8nCWO6DdGltWLTmPOsvxM,24426
 sgis/geopandas_tools/conversion.py,sha256=o3QJZLfaqqpJNdWWNKfQn_dS77uJxxRxWZxhf18vPXs,25505
-sgis/geopandas_tools/duplicates.py,sha256=p9OCYWtwkWE7i-kZX_dRqAiczsUoWEWl5I8GeYIjQOM,14968
+sgis/geopandas_tools/duplicates.py,sha256=aZaKLQedT9vP5SNRGcaIP_BqDSdD4nYS5S_v5jlWgeg,15072
 sgis/geopandas_tools/general.py,sha256=UPtmgEMhTZw-qMiCCjeTtyBlJWoVE96SSanufPK8MLs,39976
 sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
 sgis/geopandas_tools/neighbors.py,sha256=vduQlHeoZjHyD5pxDbjfonQ3-LAHGfPETxV7-L6Sg4M,16634
-sgis/geopandas_tools/overlay.py,sha256=pMQK86t0ixKErHQsP0HC8RXHUXNxDCNdH6FK1MEJamM,25779
+sgis/geopandas_tools/overlay.py,sha256=oglGB9P1nXxYcsJ8VjAiEMCvIoEo0OlyUpcH1vBAuBU,26142
 sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9hzbFYN42f9WY,6972
 sgis/geopandas_tools/polygon_operations.py,sha256=1XiwQHYPbd3Xj3B68YamzyT_2kdiJrrwIku4JjVa2ks,50066
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
@@ -30,7 +30,7 @@ sgis/maps/explore.py,sha256=0QDPaj5YU2Jps5iujuHu-vk_R9mFh_aOhbN1eU-fxcI,47898
 sgis/maps/httpserver.py,sha256=eCDoB9x74kSLiGEj2X3O91t3oscY_ia17UNuaaJ6tCc,2472
 sgis/maps/legend.py,sha256=lVRVCkhPmJRjGK23obFJZAO3qp6du1LYnobkkN7DPkc,26279
 sgis/maps/map.py,sha256=lwQUJvK3I9dPNSxPeRty9ICodz_GXQBN1OHhghI7IsE,30439
-sgis/maps/maps.py,sha256=gxu0rgcVygjudRtM1dVRmsUMilMUIg3vG-UgvASM91E,23072
+sgis/maps/maps.py,sha256=csPXJa9R7zwlDJ0lz8qW91l0uRxjo1m2smoU8IPtgLA,23091
 sgis/maps/norge_i_bilder.json,sha256=W_mFfte3DxugWbEudZ5fadZ2JeFYb0hyab2Quf4oJME,481311
 sgis/maps/thematicmap.py,sha256=w6q4_gIr8BubQgsPJkc6WXk-tmplDLGcKyjphhFp7ng,21873
 sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
@@ -59,7 +59,7 @@ sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
 sgis/raster/regex.py,sha256=kYhVpRYzoXutx1dSYmqMoselWXww7MMEsTPmLZwHjbM,3759
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.1.15.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.15.dist-info/METADATA,sha256=8cxb6fu1hpdI0vYDRV8GsJ5nLw6HH0Q6yuZZTCwL23M,11741
-ssb_sgis-1.1.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.15.dist-info/RECORD,,
+ssb_sgis-1.1.17.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.17.dist-info/METADATA,sha256=IJMLCbllCgEFZwxI9MzcifHj-m8Mx4K5kUeODzDOtkk,11741
+ssb_sgis-1.1.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.17.dist-info/RECORD,,