ssb-sgis 1.2.10__tar.gz → 1.2.11__tar.gz

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/PKG-INFO

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

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.10"
+version = "1.2.11"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -137,7 +137,7 @@ ignore_missing_imports = true
 force-exclude = true  # Apply excludes to pre-commit
 show-fixes = true
 src = ["src", "tests"]
-target-version = "py310"  # Minimum Python version supported
+target-version = "py311"  # Minimum Python version supported
 include = ["*.py", "*.pyi", "**/pyproject.toml", "*.ipynb"]
 extend-exclude = [
     "__pycache__",

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/geopandas_tools/bounds.py

@@ -634,11 +634,13 @@ def bounds_to_polygon(
     1  POLYGON ((0.00000 0.00000, 0.00000 0.00000, 0....
 
     """
+    bounds = gdf.bounds.values
+    boxes = box(bounds[:, 0], bounds[:, 1], bounds[:, 2], bounds[:, 3])
     if isinstance(gdf, GeoSeries):
-        return GeoSeries([box(*arr) for arr in gdf.bounds.values], index=gdf.index)
+        return GeoSeries(boxes, index=gdf.index)
     if copy:
         gdf = gdf.copy()
-    gdf.geometry = [box(*arr) for arr in gdf.bounds.values]
+    gdf.geometry = boxes
     return gdf
 
 

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/geopandas_tools/neighbors.py

@@ -13,6 +13,7 @@ import shapely
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
 from pandas import DataFrame
+from pandas import Index
 from pandas import MultiIndex
 from pandas import Series
 
@@ -110,6 +111,8 @@ def get_neighbor_indices(
     if gdf.crs != neighbors.crs:
         raise ValueError(f"'crs' mismatch. Got {gdf.crs} and {neighbors.crs}")
 
+    index_name = gdf.index.name
+
     if rtree_runner is None:
         rtree_runner = _get_instance(config, "rtree_runner", n_jobs=n_jobs)
 
@@ -141,6 +144,8 @@ def get_neighbor_indices(
         )
     index_mapper1 = {i: x for i, x in enumerate(gdf.index)}
     left = np.array([index_mapper1[i] for i in left])
+    if index_name:
+        left = Index(left, name=index_name)
     index_mapper2 = {i: x for i, x in enumerate(neighbors.index)}
     right = np.array([index_mapper2[i] for i in right])
     return Series(right, index=left, name="neighbor_index")

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/io/dapla_functions.py

@@ -385,6 +385,9 @@ def get_bounds_series(
     """
     file_system = _get_file_system(file_system, {})
 
+    if isinstance(paths, (str | Path)):
+        paths = [paths]
+
     threads = (
         min(len(paths), int(multiprocessing.cpu_count())) or 1 if use_threads else 1
     )
@@ -457,7 +460,7 @@ def write_geopandas(
         )
 
     if not len(df) and get_child_paths(gcs_path, file_system):
-        # no need to write empty df
+        # no need to write empty df for partitioned parquet
         return
     elif not len(df):
         if pandas_fallback:
@@ -465,8 +468,12 @@ def write_geopandas(
             df.geometry = df.geometry.astype(str)
             df.geometry = None
         try:
+            file_format: str = Path(gcs_path).suffix.lstrip(".")
+            write_method: Callable = getattr(df, f"to_{file_format}")
+            if file_format == "parquet":
+                kwargs["engine"] = "pyarrow"
             with file_system.open(gcs_path, "wb") as file:
-                _to_geopandas(df, file, **kwargs)
+                write_method(file, **kwargs)
 
         except Exception as e:
             more_txt = PANDAS_FALLBACK_INFO if not pandas_fallback else ""

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/maps/explore.py

@@ -14,7 +14,6 @@ from statistics import mean
 from typing import Any
 from typing import ClassVar
 
-import branca as bc
 import folium
 import geopandas as gpd
 import joblib
@@ -723,9 +722,9 @@ class Explore(Map):
 
         bounds = self._get_bounds(gdf)
 
-        if bounds is None:
-            self.map = None
-            return
+        if bounds is None and self.mask is not None:
+            bounds = self._get_bounds(_to_or_set_crs(to_gdf(self.mask), 4326))
+
         self.map = self._make_folium_map(
             bounds=bounds,
             max_zoom=self.max_zoom,
@@ -790,6 +789,8 @@ class Explore(Map):
                 map_.add_child(tile)
 
     def _create_continous_map(self):
+        import branca as bc
+
         self._prepare_continous_map()
         if self.scheme:
             classified = self._classify_from_bins(self._gdf, bins=self.bins)
@@ -804,9 +805,8 @@ class Explore(Map):
 
         gdf = self._prepare_gdf_for_map(self._gdf)
         bounds = self._get_bounds(gdf)
-        if bounds is None:
-            self.map = None
-            return
+        if bounds is None and self.mask is not None:
+            bounds = self._get_bounds(_to_or_set_crs(to_gdf(self.mask), 4326))
         self.map = self._make_folium_map(
             bounds=bounds,
             max_zoom=self.max_zoom,
@@ -899,6 +899,8 @@ class Explore(Map):
         map_kwds: dict | None = None,
         **kwargs,
     ):
+        import branca as bc
+
         if not map_kwds:
             map_kwds = {}
 
@@ -908,7 +910,7 @@ class Explore(Map):
         # create folium.Map object
         # Get bounds to specify location and map extent
         location = kwargs.pop("location", None)
-        if location is None:
+        if location is None and bounds is not None:
             x = mean([bounds[0], bounds[2]])
             y = mean([bounds[1], bounds[3]])
             location = (y, x)
@@ -1130,8 +1132,9 @@ class Explore(Map):
             if gdf.index.name is not None:
                 gdf = gdf.reset_index()
             # specify fields to show in the tooltip
-            tooltip = _tooltip_popup("tooltip", tooltip, gdf, **tooltip_kwds)
-            popup = _tooltip_popup("popup", popup, gdf, **popup_kwds)
+            cols = list(gdf.columns.difference({df.geometry.name}))
+            tooltip = _tooltip_popup("tooltip", tooltip, cols, **tooltip_kwds)
+            popup = _tooltip_popup("popup", popup, cols, **popup_kwds)
         else:
             tooltip = None
             popup = None
@@ -1153,7 +1156,7 @@ class Explore(Map):
 
 
 def _tooltip_popup(
-    type_: str, fields: Any, gdf: GeoDataFrame, **kwargs
+    type_: str, fields: Any, columns: list[str], **kwargs
 ) -> folium.GeoJsonTooltip | folium.GeoJsonPopup:
     """Get tooltip or popup."""
     # specify fields to show in the tooltip
@@ -1161,9 +1164,9 @@ def _tooltip_popup(
         return None
     else:
         if fields is True:
-            fields = gdf.columns.drop(gdf.geometry.name).to_list()
+            fields = columns
         elif isinstance(fields, int):
-            fields = gdf.columns.drop(gdf.geometry.name).to_list()[:fields]
+            fields = columns[:fields]
         elif isinstance(fields, str):
             fields = [fields]
 
@@ -1526,3 +1529,10 @@ def _image_collection_to_background_map(
         out = sorted(out, key=lambda x: x["label"])
 
     return out
+
+
+def _to_or_set_crs(df, crs):
+    try:
+        return df.to_crs(crs)
+    except Exception:
+        return df.set_crs(crs)

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/maps/map.py

@@ -721,7 +721,7 @@ class Map:
 
         assert gdf.index.is_unique
 
-        # if equal lenght, convert to integer and check for equality
+        # if equal length, convert to integer and check for equality
         if len(bins) == len(self._unique_values):
             if gdf[self._column].isna().all():
                 return np.repeat(len(bins), len(gdf))

{ssb_sgis-1.2.10 → ssb_sgis-1.2.11}/src/sgis/maps/wms.py

@@ -71,11 +71,10 @@ class NorgeIBilderWms(WmsLoader):
     not_contains: str | Iterable[str] | None = None
     show: bool | Iterable[int] | int = False
     _use_json: bool = True
+    url: str = "https://wms.geonorge.no/skwms1/wms.nib-prosjekter"
 
     def load_tiles(self, verbose: bool = False) -> None:
         """Load all Norge i bilder tiles into self.tiles."""
-        url = "https://wms.geonorge.no/skwms1/wms.nib-prosjekter?SERVICE=WMS&REQUEST=GetCapabilities"
-
         name_pattern = r"<Name>(.*?)</Name>"
         bbox_pattern = (
             r"<EX_GeographicBoundingBox>.*?"
@@ -86,7 +85,7 @@ class NorgeIBilderWms(WmsLoader):
         )
 
         all_tiles: list[dict] = []
-        with urlopen(url) as file:
+        with urlopen(self.url) as file:
             xml_data: str = file.read().decode("utf-8")
 
             for text in xml_data.split('<Layer queryable="1">')[1:]:
@@ -150,28 +149,6 @@ class NorgeIBilderWms(WmsLoader):
         url = "https://wms.geonorge.no/skwms1/wms.nib-mosaikk?SERVICE=WMS&REQUEST=GetCapabilities"
         wms = WebMapService(url, version="1.3.0")
         out = {}
-        # ttiles = {wms[layer].title: [] for layer in list(wms.contents)}
-        # for layer in list(wms.contents):
-        #     if wms[layer].title not in relevant_names:
-        #         continue
-        #     ttiles[wms[layer].title].append(layer)
-        # import pandas as pd
-
-        # df = pd.Series(ttiles).to_frame("title")
-        # df["n"] = df["title"].str.len()
-        # df = df.sort_values("n")
-        # for x in df["title"]:
-        #     if len(x) == 1:
-        #         continue
-        #     bounds = {tuple(wms[layer].boundingBoxWGS84) for layer in x}
-        #     if len(bounds) <= 1:
-        #         continue
-        #     print()
-        #     for layer in x:
-        #         print(layer)
-        #         print(wms[layer].title)
-        #         bbox = wms[layer].boundingBoxWGS84
-        #         print(bbox)
 
         for layer in list(wms.contents):
             title = wms[layer].title
@@ -267,7 +244,7 @@ class NorgeIBilderWms(WmsLoader):
         if not len(tile_layers):
             return tile_layers
 
-        if isinstance(self.show, int):
+        if isinstance(self.show, int) and not isinstance(self.show, bool):
             tile = tile_layers[list(tile_layers)[self.show]]
             tile.show = True
         elif isinstance(self.show, Iterable):
@@ -279,6 +256,8 @@ class NorgeIBilderWms(WmsLoader):
 
     def _filter_tiles(self, mask):
         """Filter relevant dates with pandas and geopandas because fast."""
+        if not self.tiles:
+            return pd.DataFrame(columns=["name", "year", "geometry", "bbox"])
         df = pd.DataFrame(self.tiles)
         filt = (df["name"].notna()) & (df["year"].str.contains("|".join(self.years)))
         if self.contains: