ssb-sgis 1.1.14__py3-none-any.whl → 1.1.16__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/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(

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,

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]

{ssb_sgis-1.1.14.dist-info → ssb_sgis-1.1.16.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ 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/general.py,sha256=UPtmgEMhTZw-qMiCCjeTtyBlJWoVE96SSanufPK8MLs,39976
@@ -15,7 +15,7 @@ sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyat
 sgis/geopandas_tools/neighbors.py,sha256=vduQlHeoZjHyD5pxDbjfonQ3-LAHGfPETxV7-L6Sg4M,16634
 sgis/geopandas_tools/overlay.py,sha256=pMQK86t0ixKErHQsP0HC8RXHUXNxDCNdH6FK1MEJamM,25779
 sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9hzbFYN42f9WY,6972
-sgis/geopandas_tools/polygon_operations.py,sha256=LN5w1EC7ywJLmKlkk_MyIiKbaYJNp9wWPWPb0xlORLs,49923
+sgis/geopandas_tools/polygon_operations.py,sha256=1XiwQHYPbd3Xj3B68YamzyT_2kdiJrrwIku4JjVa2ks,50066
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
 sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhmeZY,9345
 sgis/helpers.py,sha256=_h7ke9hJrRNhHW-ZX3gA95fOrX2s1ADKBMxc94p2F4Q,9627
@@ -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
@@ -54,12 +54,12 @@ sgis/parallel/parallel.py,sha256=CzHetSAr9wvSrEDFTqDq2xAsNuG1ig22-vcEOIoUVv4,396
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/base.py,sha256=tiZEuMcVK6hOm_aIjWhQ1WGshcjsxT1fFkuBSLFiMC0,7785
-sgis/raster/image_collection.py,sha256=qmxYGgdXN1ngSfpuOzyFKlxFG6YhqHmbd697tHaEQec,125639
+sgis/raster/image_collection.py,sha256=QuqCJ1HYXiVu7c6EEO5bFDFj_4MG6qxjQu7-4BNE3nI,125269
 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.14.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.14.dist-info/METADATA,sha256=bMv_HRcZc-YOhOKnCVp-91KuVPmAEwIiQI1-UWZuQpM,11741
-ssb_sgis-1.1.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.14.dist-info/RECORD,,
+ssb_sgis-1.1.16.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.16.dist-info/METADATA,sha256=Ct_hJHlYMmi8paIDe0BsB5Ev1Lrj2GdXYsbAG-i1Y6g,11741
+ssb_sgis-1.1.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.16.dist-info/RECORD,,