ssb-sgis 1.0.13__tar.gz → 1.0.15__tar.gz

{ssb_sgis-1.0.13 → ssb_sgis-1.0.15}/PKG-INFO

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

{ssb_sgis-1.0.13 → ssb_sgis-1.0.15}/pyproject.toml

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

{ssb_sgis-1.0.13 → ssb_sgis-1.0.15}/src/sgis/__init__.py

@@ -99,6 +99,7 @@ from .maps.maps import samplemap
 from .maps.thematicmap import ThematicMap
 from .maps.tilesources import kartverket as kartverket_tiles
 from .maps.tilesources import xyz as xyztiles
+from .maps.wms import NorgeIBilderWms
 from .networkanalysis.closing_network_holes import close_network_holes
 from .networkanalysis.closing_network_holes import close_network_holes_to_deadends
 from .networkanalysis.closing_network_holes import get_k_nearest_points_for_deadends

{ssb_sgis-1.0.13 → ssb_sgis-1.0.15}/src/sgis/maps/explore.py

@@ -44,6 +44,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 .wms import WmsLoader
 
 try:
     from ..raster.image_collection import Band
@@ -157,7 +158,9 @@ def to_tile(tile: str | xyzservices.TileProvider, max_zoom: int) -> folium.TileL
     except TypeError:
         name = tile
 
-    if not isinstance(tile, str):
+    if isinstance(tile, folium.map.Layer) and not isinstance(tile, folium.GeoJson):
+        return tile
+    elif not isinstance(tile, str):
         try:
             return folium.TileLayer(tile, name=name, max_zoom=max_zoom)
         except TypeError:
@@ -277,6 +280,7 @@ class Explore(Map):
         max_images: int = 10,
         max_nodata_percentage: int = 100,
         display: bool = True,
+        wms: WmsLoader | None = None,
         **kwargs,
     ) -> None:
         """Initialiser.
@@ -306,6 +310,7 @@ class Explore(Map):
             max_nodata_percentage: Maximum percentage nodata values (e.g. clouds) ro allow in
                 image arrays.
             display: Whether to display the map interactively.
+            wms: A WmsLoader instance for loading image tiles as layers. E.g. NorgeIBilderWms.
             **kwargs: Additional keyword arguments. Can also be geometry-like objects
                 where the key is the label.
         """
@@ -322,6 +327,7 @@ class Explore(Map):
         self.max_images = max_images
         self.max_nodata_percentage = max_nodata_percentage
         self.display = display
+        self.wms = [wms] if isinstance(wms, WmsLoader) else wms
         self.legend = None
 
         self.browser = browser
@@ -760,6 +766,12 @@ 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:
+        for wms in self.wms:
+            tiles = wms.get_tiles(bbox, max_zoom=self.max_zoom)
+            for tile in tiles.values():
+                map_.add_child(tile)
+
     def _create_continous_map(self):
         self._prepare_continous_map()
         if self.scheme:
@@ -966,6 +978,9 @@ class Explore(Map):
             m.get_root().add_child(style)
             # folium.LayerControl(collapsed=False).add_to(m)
 
+        if self.wms:
+            self._add_wms(m, bounds)
+
         return m
 
     def _make_geojson(
@@ -1112,6 +1127,7 @@ class Explore(Map):
             highlight_function=highlight_function,
             smooth_factor=self.smooth_factor,
             show=show,
+            # on_each_feature="function(feature,layer){layer.bindTooltip(feature.properties.NAME,{permanent:true,direction:'center'});return layer;}",
             **kwargs,
         )
 
@@ -1141,6 +1157,8 @@ def _tooltip_popup(
         return folium.GeoJsonTooltip(fields, **kwargs)
     elif type_ == "popup":
         return folium.GeoJsonPopup(fields, **kwargs)
+    else:
+        raise ValueError(type_)
 
 
 def _intersects_if_not_none_or_empty(obj: Any, other: Any) -> bool:

{ssb_sgis-1.0.13 → ssb_sgis-1.0.15}/src/sgis/maps/maps.py

@@ -32,6 +32,7 @@ from ..geopandas_tools.geometry_types import get_geom_type
 from .explore import Explore
 from .map import Map
 from .thematicmap import ThematicMap
+from .wms import WmsLoader
 
 try:
     from torchgeo.datasets.geo import RasterDataset
@@ -57,6 +58,9 @@ def _get_location_mask(kwargs: dict, gdfs) -> tuple[GeoDataFrame | None, dict]:
         "akersveien": (10.7476367, 59.9222191),
         "kongsvinger": (12.0035242, 60.1875279),
         "stavanger": (5.6960601, 58.8946196),
+        "trondheim": (10.39677054, 63.42687816),
+        "trondhjem": (10.39677054, 63.42687816),
+        "bergen": (5.32574594, 60.39550309),
         "volda": (6.0705987, 62.146643),
     }
 
@@ -87,6 +91,7 @@ def explore(
     size: int | None = None,
     max_images: int = 10,
     max_nodata_percentage: int = 100,
+    wms: WmsLoader | None = None,
     **kwargs,
 ) -> Explore:
     """Interactive map of GeoDataFrames with layers that can be toggled on/off.
@@ -118,6 +123,7 @@ def explore(
             map. Defaults to 10.
         max_nodata_percentage: Maximum percentage nodata values (e.g. clouds) ro allow in
             image arrays.
+        wms: A WmsLoader instance for loading image tiles as layers. E.g. NorgeIBilderWms.
         **kwargs: Keyword arguments to pass to geopandas.GeoDataFrame.explore, for
             instance 'cmap' to change the colors, 'scheme' to change how the data
             is grouped. This defaults to 'fisherjenkssampled' for numeric data.
@@ -167,6 +173,7 @@ def explore(
             max_zoom=max_zoom,
             max_images=max_images,
             max_nodata_percentage=max_nodata_percentage,
+            wms=wms,
             **kwargs,
         )
 
@@ -224,6 +231,7 @@ def explore(
             max_zoom=max_zoom,
             max_images=max_images,
             max_nodata_percentage=max_nodata_percentage,
+            wms=wms,
             **kwargs,
         )
 
@@ -235,6 +243,7 @@ def explore(
         smooth_factor=smooth_factor,
         max_images=max_images,
         max_nodata_percentage=max_nodata_percentage,
+        wms=wms,
         **kwargs,
     )
 
@@ -260,6 +269,7 @@ def samplemap(
     browser: bool = False,
     max_images: int = 10,
     max_nodata_percentage: int = 100,
+    wms: WmsLoader | None = None,
     **kwargs,
 ) -> Explore:
     """Shows an interactive map of a random area of GeoDataFrames.
@@ -295,6 +305,7 @@ def samplemap(
             map. Defaults to 10.
         max_nodata_percentage: Maximum percentage nodata values (e.g. clouds) ro allow in
             image arrays.
+        wms: A WmsLoader instance for loading image tiles as layers. E.g. NorgeIBilderWms.
         **kwargs: Keyword arguments to pass to geopandas.GeoDataFrame.explore, for
             instance 'cmap' to change the colors, 'scheme' to change how the data
             is grouped. This defaults to 'fisherjenkssampled' for numeric data.
@@ -378,6 +389,7 @@ def samplemap(
         smooth_factor=smooth_factor,
         max_images=max_images,
         max_nodata_percentage=max_nodata_percentage,
+        wms=wms,
         **kwargs,
     )
 
@@ -392,6 +404,7 @@ def clipmap(
     browser: bool = False,
     max_images: int = 10,
     max_nodata_percentage: int = 100,
+    wms: WmsLoader | None = None,
     **kwargs,
 ) -> Explore | Map:
     """Shows an interactive map of a of GeoDataFrames clipped to the mask extent.
@@ -422,6 +435,7 @@ def clipmap(
             map. Defaults to 10.
         max_nodata_percentage: Maximum percentage nodata values (e.g. clouds) ro allow in
             image arrays.
+        wms: A WmsLoader instance for loading image tiles as layers. E.g. NorgeIBilderWms.
         **kwargs: Keyword arguments to pass to geopandas.GeoDataFrame.explore, for
             instance 'cmap' to change the colors, 'scheme' to change how the data
             is grouped. This defaults to 'fisherjenkssampled' for numeric data.
@@ -457,6 +471,7 @@ def clipmap(
             smooth_factor=smooth_factor,
             max_images=max_images,
             max_nodata_percentage=max_nodata_percentage,
+            wms=wms,
             **kwargs,
         )
         m.mask = mask