ssb-sgis 1.1.14__tar.gz → 1.1.16__tar.gz

{ssb_sgis-1.1.14 → ssb_sgis-1.1.16}/PKG-INFO

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

{ssb_sgis-1.1.14 → ssb_sgis-1.1.16}/pyproject.toml

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

{ssb_sgis-1.1.14 → ssb_sgis-1.1.16}/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.14 → ssb_sgis-1.1.16}/src/sgis/geopandas_tools/polygon_operations.py

@@ -205,9 +205,9 @@ def get_polygon_clusters(
 
 def get_cluster_mapper(
     gdf: GeoDataFrame | GeoSeries, predicate: str = "intersects"
-) -> dict[int, int]:
-    if not gdf.index.is_unique:
-        raise ValueError("Index must be unique")
+) -> list[int]:
+    """Returns a list of cluster indices corresponding to the order of the input GeoDataFrame or GeoSeries."""
+    gdf = gdf.reset_index(drop=True)
     neighbors = get_neighbor_indices(gdf, gdf, predicate=predicate)
 
     edges = [(source, target) for source, target in neighbors.items()]
@@ -215,11 +215,12 @@ def get_cluster_mapper(
     graph = nx.Graph()
     graph.add_edges_from(edges)
 
-    return {
-        j: i
-        for i, component in enumerate(nx.connected_components(graph))
-        for j in component
+    mapper = {
+        i: cluster_index
+        for cluster_index, component in enumerate(nx.connected_components(graph))
+        for i in component
     }
+    return list(dict(sorted(mapper.items())).values())
 
 
 def eliminate_by_longest(

{ssb_sgis-1.1.14 → ssb_sgis-1.1.16}/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,

{ssb_sgis-1.1.14 → ssb_sgis-1.1.16}/src/sgis/raster/image_collection.py

@@ -897,9 +897,6 @@ class Band(_ImageBandBase):
             if self._bounds is None:
                 raise ValueError("Must specify bounds when data is an array.")
             if not (res is None or (callable(res) and res() is None)):
-                # if not (res is None or (callable(res) and res() is None)) and _res_as_tuple(
-                #     res
-                # ) != _get_res_from_bounds(self._bounds, data.shape):
                 raise ValueError(
                     f"Cannot specify 'res' when data is an array. {res} and {_get_res_from_bounds(self._bounds, data.shape)}"
                 )
@@ -934,10 +931,6 @@ class Band(_ImageBandBase):
 
         if self.metadata:
             parent = _fix_path(str(Path(self.path).parent))
-            if self.path is not None:
-                self.metadata = {
-                    key: value for key, value in self.metadata.items() if key == parent
-                }
             for key, value in self.metadata.get(parent, {}).items():
                 if key == "bands" and self.band_id in value:
                     band_metadata = value[self.band_id]