ssb-sgis 1.2.6__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/geopandas_tools/geocoding.py

@@ -1,7 +1,3 @@
-try:
-    import geocoder
-except ImportError:
-    pass
 from geopandas import GeoDataFrame
 
 from .conversion import to_gdf
@@ -9,6 +5,8 @@ from .conversion import to_gdf
 
 def address_to_gdf(address: str, crs=4326) -> GeoDataFrame:
     """Takes an address and returns a point GeoDataFrame."""
+    import geocoder
+
     g = geocoder.osm(address).json
     coords = g["lng"], g["lat"]
     return to_gdf(coords, crs=4326).to_crs(crs)
@@ -16,6 +14,8 @@ def address_to_gdf(address: str, crs=4326) -> GeoDataFrame:
 
 def address_to_coords(address: str, crs=4326) -> tuple[float, float]:
     """Takes an address and returns a tuple of xy coordinates."""
+    import geocoder
+
     g = geocoder.osm(address).json
     coords = g["lng"], g["lat"]
     point = to_gdf(coords, crs=4326).to_crs(crs)

sgis/geopandas_tools/sfilter.py

@@ -83,6 +83,8 @@ def sfilter(
     """
     if not isinstance(gdf, (GeoDataFrame | GeoSeries)):
         raise TypeError(gdf_type_error_message)
+    if not len(gdf):
+        return gdf
 
     other = _sfilter_checks(other, crs=gdf.crs)
 
@@ -159,6 +161,9 @@ def sfilter_split(
     >>> not_intersecting = df1.loc[~filt]
 
     """
+    if not len(gdf):
+        return gdf, gdf
+
     if not isinstance(gdf, (GeoDataFrame | GeoSeries)):
         raise TypeError(gdf_type_error_message)
 
@@ -235,6 +240,9 @@ def sfilter_inverse(
     """
     if not isinstance(gdf, (GeoDataFrame | GeoSeries)):
         raise TypeError(gdf_type_error_message)
+    if not len(gdf):
+        return gdf
+
     other = _sfilter_checks(other, crs=gdf.crs)
     indices = _get_sfilter_indices(
         gdf, other, predicate, distance, n_jobs, rtree_runner

sgis/maps/explore.py

@@ -43,6 +43,7 @@ from ..geopandas_tools.general import clean_geoms
 from ..geopandas_tools.general import make_all_singlepart
 from ..geopandas_tools.geometry_types import get_geom_type
 from ..geopandas_tools.geometry_types import to_single_geom_type
+from ..geopandas_tools.sfilter import sfilter
 from ..helpers import _get_file_system
 from ..helpers import dict_zip
 from .wms import WmsLoader
@@ -487,10 +488,13 @@ class Explore(Map):
             if not isinstance(center, GeoDataFrame)
             else center
         )
+        centerbuffer = centerpoint.buffer(size)
 
         for label, gdf in self._gdfs.items():
             keep_geom_type = False if get_geom_type(gdf) == "mixed" else True
-            gdf = gdf.clip(centerpoint.buffer(size), keep_geom_type=keep_geom_type)
+            gdf = sfilter(gdf, centerbuffer).clip(
+                centerbuffer, keep_geom_type=keep_geom_type
+            )
             self._gdfs[label] = gdf
         self._gdf = pd.concat(self._gdfs.values(), ignore_index=True)
 
@@ -547,7 +551,7 @@ class Explore(Map):
             kwargs.pop("column", None)
 
         for label, gdf in self._gdfs.items():
-            gdf = gdf.clip(self.mask)
+            gdf = sfilter(gdf, self.mask).clip(self.mask)
             collections = gdf.loc[gdf.geom_type == "GeometryCollection"]
             if len(collections):
                 collections = make_all_singlepart(collections)
@@ -775,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)
 
@@ -991,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/map.py

@@ -295,9 +295,10 @@ class Map:
             else:
                 return series.astype("string")
 
-        for i, gdf in enumerate(self._gdfs):
+        for label, gdf in self._gdfs.items():
             if self.column in gdf:
-                self._gdfs[i][self.column] = to_string_via_int(gdf[self.column])
+                gdf[self.column] = to_string_via_int(gdf[self.column])
+                self._gdfs[label] = gdf
         self._gdf[self.column] = to_string_via_int(self._gdf[self.column])
 
     def __bool__(self) -> bool:

sgis/maps/maps.py

@@ -29,6 +29,7 @@ from ..geopandas_tools.general import get_common_crs
 from ..geopandas_tools.general import is_wkt
 from ..geopandas_tools.geocoding import address_to_gdf
 from ..geopandas_tools.geometry_types import get_geom_type
+from ..geopandas_tools.sfilter import sfilter
 from .explore import Explore
 from .map import Map
 from .thematicmap import ThematicMap
@@ -196,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)
 
@@ -472,8 +476,10 @@ def clipmap(
         if m.gdfs is None and not len(m.rasters):
             return m
 
-        m._gdfs = {label: gdf.clip(mask) for label, gdf in m._gdfs.items()}
-        m._gdf = m._gdf.clip(mask)
+        m._gdfs = {
+            label: sfilter(gdf, mask).clip(mask) for label, gdf in m._gdfs.items()
+        }
+        m._gdf = sfilter(m._gdf, mask).clip(mask)
         m._nan_idx = m._gdf[m._column].isna()
         m._get_unique_values()
         m.explore(center=center, size=size)
@@ -487,8 +493,10 @@ def clipmap(
         if m.gdfs is None:
             return m
 
-        m._gdfs = {label: gdf.clip(mask) for label, gdf in m._gdfs.items()}
-        m._gdf = m._gdf.clip(mask)
+        m._gdfs = {
+            label: sfilter(gdf, mask).clip(mask) for label, gdf in m._gdfs.items()
+        }
+        m._gdf = sfilter(m._gdf, mask).clip(mask)
         m._nan_idx = m._gdf[m._column].isna()
         m._get_unique_values()