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

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

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

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

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

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/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)

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/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

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/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)

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/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:

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/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
@@ -472,8 +473,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 +490,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()
 

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/sgis/networkanalysis/_points.py

@@ -45,14 +45,12 @@ class Points:
             return [0 for _ in distances]
 
         if rules.nodedist_multiplier and rules.nodedist_kmh:
-            raise ValueError(
-                "Can only specify one of 'nodedist_multiplier' and 'nodedist_kmh'"
-            )
+            raise ValueError("Cannot set both 'nodedist_multiplier' and 'nodedist_kmh'")
 
         if rules.nodedist_multiplier:
-            if rules.weight != "meters":
+            if rules.weight == "minutes":
                 raise ValueError(
-                    "Can only specify 'nodedist_multiplier' when the 'weight' is meters"
+                    "Cannot set 'nodedist_multiplier' when the 'weight' is minutes"
                 )
             return [x * rules.nodedist_multiplier for x in distances]
 

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/sgis/raster/base.py

@@ -38,10 +38,8 @@ def _get_transform_from_bounds(
     obj: GeoDataFrame | GeoSeries | Geometry | tuple, shape: tuple[int, ...]
 ) -> Affine:
     minx, miny, maxx, maxy = to_bbox(obj)
-    if len(shape) == 2:
-        height, width = shape
-    elif len(shape) == 3:
-        _, height, width = shape
+    if len(shape) in [2, 3]:
+        height, width = shape[-2:]
     else:
         return None
         # raise ValueError(shape)
@@ -104,7 +102,7 @@ def _array_to_geojson(
             return _array_to_geojson_loop(array, transform, mask, processes)
 
         except Exception as err:
-            raise err.__class__(array.shape, err) from err
+            raise err.__class__(f"{array.shape}: {err}") from err
 
 
 def _array_to_geojson_loop(array, transform, mask, processes):

{ssb_sgis-1.2.6 → ssb_sgis-1.2.7}/src/sgis/raster/image_collection.py

@@ -860,7 +860,6 @@ class Band(_ImageBandBase):
             self.transform = _get_transform_from_bounds(self._bounds, shape=data.shape)
             self._from_array = True
             self.values = data
-
             self._res = _get_res_from_bounds(self._bounds, self.values.shape)
 
         elif not isinstance(data, (str | Path | os.PathLike)):
@@ -1077,7 +1076,6 @@ class Band(_ImageBandBase):
             self.transform = None
             # activate setter
             self.values = self._values
-
             return self
 
         if self.has_array and bounds_was_none:
@@ -1162,8 +1160,7 @@ class Band(_ImageBandBase):
                         values.shape,
                     )
 
-                    width, height = values.shape[-2:]
-
+                    height, width = values.shape[-2:]
                     if width and height:
                         self.transform = rasterio.transform.from_bounds(
                             *bounds, width, height