ssb-sgis 1.2.7__tar.gz → 1.2.9__tar.gz

{ssb_sgis-1.2.7 → ssb_sgis-1.2.9}/PKG-INFO

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

{ssb_sgis-1.2.7 → ssb_sgis-1.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.7"
+version = "1.2.9"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -67,6 +67,8 @@ mypy = ">=0.930"
 pre-commit = ">=2.16.0"
 pre-commit-hooks = ">=4.1.0"
 ruff = ">=0.0.284"
+owslib = ">=0.34.0"
+pillow = ">=11.0.0"
 pytest = ">=6.2.5"
 sphinx = ">=6.2.1"
 sphinx-autobuild = ">=2021.3.14"

{ssb_sgis-1.2.7 → ssb_sgis-1.2.9}/src/sgis/geopandas_tools/buffer_dissolve_explode.py

@@ -432,7 +432,7 @@ def _run_func_by_cluster(
 
     def get_group_clusters(group: GeoDataFrame):
         """Adds cluster column. Applied to each group because much faster."""
-        group = group.reset_index(drop=True)
+        group = group[~group.is_empty].reset_index(drop=True)
         group["_cluster"] = get_cluster_mapper(group, predicate=predicate)
         group["_cluster"] = get_grouped_centroids(group, groupby="_cluster")
         return group

{ssb_sgis-1.2.7 → ssb_sgis-1.2.9}/src/sgis/maps/explore.py

@@ -779,9 +779,13 @@ class Explore(Map):
         for tile in tiles:
             to_tile(tile, max_zoom=self.max_zoom).add_to(mapobj)
 
-    def _add_wms(self, map_: folium.Map, bbox: Any) -> None:
+    def _add_wms(self, map_: folium.Map) -> None:
+        try:
+            gdf = self._gdf.to_crs(4326)
+        except Exception:
+            gdf = self._gdf.set_crs(4326)
         for wms in self.wms:
-            tiles = wms.get_tiles(bbox, max_zoom=self.max_zoom)
+            tiles = wms.get_tiles(gdf, max_zoom=self.max_zoom)
             for tile in tiles.values():
                 map_.add_child(tile)
 
@@ -995,7 +999,7 @@ class Explore(Map):
             # folium.LayerControl(collapsed=False).add_to(m)
 
         if self.wms:
-            self._add_wms(m, bounds)
+            self._add_wms(m)
 
         return m
 

{ssb_sgis-1.2.7 → ssb_sgis-1.2.9}/src/sgis/maps/maps.py

@@ -197,10 +197,13 @@ def explore(
 
         bounds: Polygon = box(*get_total_bounds(*gdfs, *list(kwargs.values())))
 
-        any_intersections: bool = mask.intersects(bounds).any()
+        if bounds is not None:
+            any_intersections: bool = mask.intersects(bounds).any()
+        else:
+            any_intersections = False
         if not any_intersections and to_crs is None:
             mask = to_gdf(Polygon(), to_crs)
-        elif not any_intersections:
+        elif not any_intersections and bounds is not None:
             bounds4326 = to_gdf(bounds, to_crs).to_crs(25833).geometry.iloc[0]
             mask4326 = mask.set_crs(4326, allow_override=True).to_crs(25833)