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

sgis/maps/wms.py

@@ -4,18 +4,33 @@ import json
 import re
 from collections.abc import Iterable
 from dataclasses import dataclass
+from io import BytesIO
 from pathlib import Path
 from typing import Any
 from urllib.request import urlopen
 
 import folium
+import numpy as np
+import pandas as pd
 import shapely
-
+from geopandas import GeoDataFrame
+from geopandas import GeoSeries
+from shapely import Geometry
+from shapely import get_exterior_ring
+from shapely import make_valid
+from shapely import polygons
+from shapely import set_precision
+from shapely import simplify
+from shapely.errors import GEOSException
+
+from ..geopandas_tools.conversion import to_gdf
 from ..geopandas_tools.conversion import to_shapely
+from ..geopandas_tools.sfilter import sfilter
+from ..raster.image_collection import Band
 
 JSON_PATH = Path(__file__).parent / "norge_i_bilder.json"
 
-JSON_YEARS = [str(year) for year in range(1999, 2025)]
+JSON_YEARS = [str(year) for year in range(2006, datetime.datetime.now().year + 1)]
 
 DEFAULT_YEARS: tuple[str] = tuple(
     str(year)
@@ -57,7 +72,7 @@ class NorgeIBilderWms(WmsLoader):
     show: bool | Iterable[int] | int = False
     _use_json: bool = True
 
-    def load_tiles(self) -> None:
+    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"
 
@@ -107,7 +122,10 @@ class NorgeIBilderWms(WmsLoader):
                 this_tile["name"] = name
                 this_tile["bbox"] = this_bbox
                 year = name.split(" ")[-1]
-                if year.isnumeric() and len(year) == 4:
+                is_year_or_interval: bool = all(
+                    part.isnumeric() and len(part) == 4 for part in year.split("-")
+                )
+                if is_year_or_interval:
                     this_tile["year"] = year
                 else:
                     this_tile["year"] = "9999"
@@ -116,41 +134,123 @@ class NorgeIBilderWms(WmsLoader):
 
         self.tiles = sorted(all_tiles, key=lambda x: x["year"])
 
-    def get_tiles(self, bbox: Any, max_zoom: int = 40) -> list[folium.WmsTileLayer]:
-        """Get all Norge i bilder tiles intersecting with a bbox."""
+        masks = self._get_norge_i_bilder_polygon_masks(verbose=verbose)
+        for tile in self.tiles:
+            mask = masks.get(tile["name"], None)
+            tile["geometry"] = mask
+
+    def _get_norge_i_bilder_polygon_masks(self, verbose: bool):
+        from owslib.util import ServiceException
+        from owslib.wms import WebMapService
+        from PIL import Image
+
+        relevant_names: dict[str, str] = {x["name"]: x["bbox"] for x in self.tiles}
+        assert len(relevant_names), relevant_names
+
+        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
+            if title not in relevant_names:
+                continue
+            bbox = wms[layer].boundingBoxWGS84
+            bbox = tuple(to_gdf(bbox, crs=4326).to_crs(25832).total_bounds)
+
+            existing_bbox = relevant_names[title]
+            existing_bbox = to_gdf(existing_bbox, crs=4326).to_crs(25832).union_all()
+            if not to_shapely(bbox).intersects(existing_bbox):
+                continue
+            diffx = bbox[2] - bbox[0]
+            diffy = bbox[3] - bbox[1]
+            width = int(diffx / 40)
+            height = int(diffy / 40)
+            if not bbox:
+                continue
+            try:
+                img = wms.getmap(
+                    layers=[layer],
+                    styles=[""],  # Empty unless you know the style
+                    srs="EPSG:25832",
+                    bbox=bbox,
+                    size=(width, height),
+                    format="image/jpeg",
+                    transparent=True,
+                    bgcolor="#FFFFFF",
+                )
+            except (ServiceException, AttributeError) as e:
+                if verbose:
+                    print(type(e), e)
+                continue
+
+            arr = np.array(Image.open(BytesIO(img.read())))
+            if not np.sum(arr):
+                continue
+
+            band = Band(
+                np.where(np.any(arr != 0, axis=-1), 1, 0), bounds=bbox, crs=25832
+            )
+            polygon = band.to_geopandas()[lambda x: x["value"] == 1].geometry.values
+            polygon = make_valid(polygons(get_exterior_ring(polygon)))
+            polygon = make_valid(set_precision(polygon, 1))
+            polygon = make_valid(simplify(polygon, 100))
+            polygon = make_valid(set_precision(polygon, 1))
+            polygon = GeoSeries(polygon, crs=25832).to_crs(4326)
+            if verbose:
+                print(f"Layer name: {layer}")
+                print(f"Title: {wms[layer].title}")
+                print(f"Bounding box: {wms[layer].boundingBoxWGS84}")
+                print(f"polygon: {polygon}")
+                print("-" * 40)
+
+            for x in [0, 0.1, 0.001, 1]:
+                try:
+                    out[title] = make_valid(polygon.buffer(x).make_valid().union_all())
+                except GEOSException:
+                    pass
+                break
+
+        return out
+
+    def get_tiles(self, mask: Any, max_zoom: int = 40) -> list[folium.WmsTileLayer]:
+        """Get all Norge i bilder tiles intersecting with a mask (bbox or polygon)."""
         if self.tiles is None:
             self.load_tiles()
 
-        all_tiles = {}
-
-        bbox = to_shapely(bbox)
+        if not isinstance(mask, (GeoSeries | GeoDataFrame | Geometry)):
+            mask = to_shapely(mask)
 
         if isinstance(self.show, bool):
             show = self.show
         else:
             show = False
 
-        for tile in self.tiles:
-            if not tile["bbox"] or not tile["bbox"].intersects(bbox):
-                continue
-
-            name = tile["name"]
-
-            if (
-                not name
-                or not any(year in name for year in self.years)
-                or (
-                    self.contains
-                    and not any(re.search(x, name.lower()) for x in self.contains)
-                )
-                or (
-                    self.not_contains
-                    and any(re.search(x, name.lower()) for x in self.not_contains)
-                )
-            ):
-                continue
-
-            all_tiles[name] = folium.WmsTileLayer(
+        relevant_tiles = self._filter_tiles(mask)
+        tile_layers = {
+            name: folium.WmsTileLayer(
                 url="https://wms.geonorge.no/skwms1/wms.nib-prosjekter",
                 name=name,
                 layers=name,
@@ -161,16 +261,37 @@ class NorgeIBilderWms(WmsLoader):
                 show=show,
                 max_zoom=max_zoom,
             )
+            for name in relevant_tiles["name"]
+        }
+
+        if not len(tile_layers):
+            return tile_layers
 
         if isinstance(self.show, int):
-            tile = all_tiles[list(all_tiles)[self.show]]
+            tile = tile_layers[list(tile_layers)[self.show]]
             tile.show = True
         elif isinstance(self.show, Iterable):
             for i in self.show:
-                tile = all_tiles[list(all_tiles)[i]]
+                tile = tile_layers[list(tile_layers)[i]]
                 tile.show = True
 
-        return all_tiles
+        return tile_layers
+
+    def _filter_tiles(self, mask):
+        """Filter relevant dates with pandas and geopandas because fast."""
+        df = pd.DataFrame(self.tiles)
+        filt = (df["name"].notna()) & (df["year"].str.contains("|".join(self.years)))
+        if self.contains:
+            for x in self.contains:
+                filt &= df["name"].str.contains(x)
+        if self.not_contains:
+            for x in self.not_contains:
+                filt &= ~df["name"].str.contains(x)
+        df = df[filt]
+        geoms = np.where(df["geometry"].notna(), df["geometry"], df["bbox"])
+        geoms = GeoSeries(geoms)
+        assert geoms.index.is_unique
+        return df.iloc[sfilter(geoms, mask).index]
 
     def __post_init__(self) -> None:
         """Fix typings."""
@@ -195,7 +316,11 @@ class NorgeIBilderWms(WmsLoader):
                 return
             self.tiles = [
                 {
-                    key: value if key != "bbox" else shapely.wkt.loads(value)
+                    key: (
+                        value
+                        if key not in ["bbox", "geometry"]
+                        else shapely.wkt.loads(value)
+                    )
                     for key, value in tile.items()
                 }
                 for tile in self.tiles

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]
 

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):

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

{ssb_sgis-1.2.6.dist-info → ssb_sgis-1.2.8.dist-info}/METADATA

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

{ssb_sgis-1.2.6.dist-info → ssb_sgis-1.2.8.dist-info}/RECORD

@@ -4,13 +4,13 @@ sgis/debug_config.py,sha256=Tfr19kU46hSkkspsIJcrUWvlhaL4U3-f8xEPkujSCAQ,593
 sgis/exceptions.py,sha256=WNaEBPNNx0rmz-YDzlFX4vIE7ocJQruUTqS2RNAu2zU,660
 sgis/geopandas_tools/__init__.py,sha256=bo8lFMcltOz7TtWAi52_ekR2gd3mjfBfKeMDV5zuqFY,28
 sgis/geopandas_tools/bounds.py,sha256=YJyF0gp78hFAjLLZmDquRKCBAtbt7QouG3snTcJeNQs,23822
-sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=ReIgoeh6CUVcLmsUZ_pyoWYg6iBZzYiGmFq6CMOKRvE,19535
+sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=z9HvakazR_prXH862e8-gEe7UFbeI4rRTbUaBgPeMBk,19552
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
 sgis/geopandas_tools/cleaning.py,sha256=fST0xFztmyn-QUOAfvjZmu7aO_zPiolWK7gd7TR6ffI,24393
 sgis/geopandas_tools/conversion.py,sha256=CrasgWHAnUmLC5tP73ZTDjQ6ahKFHQGqWj86PUif24M,24176
 sgis/geopandas_tools/duplicates.py,sha256=TDDM4u1n7SIkyJrOfl1Lno92AmUPqtXBHsj1IUKC0hI,14992
 sgis/geopandas_tools/general.py,sha256=YRpNEdwTHyFdQOdAfbCmYXS7PxoDjXxoagwpteXkYdI,43937
-sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
+sgis/geopandas_tools/geocoding.py,sha256=sZjUW52ULhQWDLmU51C9_itBePkDuWkp8swvYaiYmJk,679
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
 sgis/geopandas_tools/neighbors.py,sha256=qTvnOyQyrcWQd0BDrmOvFQd8csMh005e_idJGmB4g7k,17485
 sgis/geopandas_tools/overlay.py,sha256=5i9u8GgFuU0fCqzELsbIaoUPhw-E7eZHl_yKB0wEcGM,23464
@@ -18,7 +18,7 @@ sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9h
 sgis/geopandas_tools/polygon_operations.py,sha256=v-B9IgbFfm4dVHKPyzvmnNiqVCdtl9ddpCsQpZZ-9sU,49284
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
 sgis/geopandas_tools/runners.py,sha256=J4lH0RXYDYTLVeQFgNv8gEY0E97QGIQ4zPW5vfoxgDU,12979
-sgis/geopandas_tools/sfilter.py,sha256=BPz6-_9B7QdyYmVatZXavdHj7FIW_ztIyJHQOkKJt7A,10284
+sgis/geopandas_tools/sfilter.py,sha256=CZ_-c4t1CQCwJ7RHCKo1Na9u-aAg18xXnJAMiUqoaj8,10411
 sgis/geopandas_tools/utils.py,sha256=X0pRvB1tWgV_0BCrRS1HU9LtLGnZCpvVPxyqM9JGb0Y,1415
 sgis/helpers.py,sha256=4N6vFWQ3TYVzRHNcWY_fNa_GkFuaZB3vtCkkFND-qs0,9628
 sgis/io/__init__.py,sha256=uyBr20YDqB2bQttrd5q1JuGOvX32A-MSvS7Wmw5f5qg,177
@@ -28,19 +28,19 @@ sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/maps/examine.py,sha256=Pb0dH8JazU5E2svfQrzHO1Bi-sjy5SeyY6zoeMO34jE,9369
-sgis/maps/explore.py,sha256=A6-i0uKYIdfS46zrPIURObJqmt2VuQjXyS8FVk58cHU,47657
+sgis/maps/explore.py,sha256=azfNNcEEiNp2lJxWN1Emf7kcmG60WL_ok_ilMw0-IL8,47914
 sgis/maps/httpserver.py,sha256=TETSGOgLjKl3TquPGoIP0tCJCz7BIwmXrrzSCT7jhXE,2550
 sgis/maps/legend.py,sha256=qq2RkebuaNAdFztlXrDOWbN0voeK5w5VycmRKyx0NdM,26512
-sgis/maps/map.py,sha256=WZ5JnCpdioBCEh6kmV3XB4xVw41fYsEmQ6v8MIfwzmY,30727
-sgis/maps/maps.py,sha256=Zkp-UGj92BCFYhY1_TLXL4FjnvwOjGMAryoWCtFdwPk,22989
-sgis/maps/norge_i_bilder.json,sha256=VKmb7rg4jvgc8_Ve1fFnHyZ_Dkv4T5GTA0UCpqpFAi4,492751
+sgis/maps/map.py,sha256=XWf3QJ6a4gZno2NziK1dKLRktJGGr-vn6eHudBlW9Uc,30758
+sgis/maps/maps.py,sha256=fLK5WUlQ2YTm7t-8260lYxCFvpZN6j0Y-bVYCyv8NAY,23249
+sgis/maps/norge_i_bilder.json,sha256=G9DIN_2vyn-18UF5wUC-koZxFCbiNxMu0BbCJhMFJUk,15050340
 sgis/maps/thematicmap.py,sha256=Z3o_Bca0oty5Cn35pZfX5Qy52sXDVIMVSFD6IlZrovo,25111
 sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
-sgis/maps/wms.py,sha256=LSBtKkG5d-sggK_qO8BvOHBvPZZV_7AAo25kHF6kPio,6933
+sgis/maps/wms.py,sha256=oB7jeE3rSRhM-xz7t95hFLjtuG18mw7CV4wNx6IuBes,12001
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=dMX4Vm6O90ISIZPjQWuZMVMuEubkeSdC2osMCbFvrRU,7750
 sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
-sgis/networkanalysis/_points.py,sha256=ajCy17dAmRq3bWRkNu_0LHreCVJ5Uh8DzAKWxyw7ipw,4481
+sgis/networkanalysis/_points.py,sha256=128QEepBGAyI5XakMUVvNyOnJE0Ts7hvGiVUt1YTXiU,4439
 sgis/networkanalysis/_service_area.py,sha256=jE0X54yS4eMfZYJXeKe_NgMKPDpau-05xWZaxDi_c6Y,5546
 sgis/networkanalysis/closing_network_holes.py,sha256=FYZ677nRwLmDkP6bQ1ssQ_h29RzAG463U4xmbu5ksfg,14572
 sgis/networkanalysis/cutting_lines.py,sha256=ZQAt0cufaPeNAEqUzp-imu26AIL9S5-lw6Xifa8RoWk,9818
@@ -55,13 +55,13 @@ sgis/parallel/__init__.py,sha256=fw_Fl3IJk1bKzrRBhZIoOpznJqwd09NVHJJFj2ZLeIU,32
 sgis/parallel/parallel.py,sha256=V7O5mEZdfJpcOPrmn2H4bEGtbzA0FggjQ8dGhznjr80,40052
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sgis/raster/base.py,sha256=tiZEuMcVK6hOm_aIjWhQ1WGshcjsxT1fFkuBSLFiMC0,7785
-sgis/raster/image_collection.py,sha256=gbC0V2Xmckrsi1iAKbYgrsb_f9rja6Y7QUqMMJVCy2Y,121700
+sgis/raster/base.py,sha256=8JdXXDj8CgJQt5WIkkNbpM5U0pYyQrWQY9dszfUaUQ4,7743
+sgis/raster/image_collection.py,sha256=H7d9c6f-LsGXBK8oCpWBlgd2zbLxYvfNMYllnbrO_rk,121697
 sgis/raster/indices.py,sha256=efJmgfPg_VuSzXFosXV661IendF8CwPFWtMhyP4TMUg,222
 sgis/raster/regex.py,sha256=4idTJ9vFtsGtbxcjJrx2VrpJJuDMP3bLdqF93Vc_cmY,3752
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.2.6.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.2.6.dist-info/METADATA,sha256=1g2k5KcE4NTLcxfNqL08atchi_udhavHB7YLWfLrbew,11740
-ssb_sgis-1.2.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.2.6.dist-info/RECORD,,
+ssb_sgis-1.2.8.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.2.8.dist-info/METADATA,sha256=3bsjQU53D8bZVZ7J2VgZDeUeB0wP6hhnXJBKsvLz18M,11740
+ssb_sgis-1.2.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.2.8.dist-info/RECORD,,