ssb-sgis 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

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

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
 

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)