ssb-sgis 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

sgis/helpers.py

@@ -72,19 +72,29 @@ def to_numpy_func(text: str) -> Callable:
     raise ValueError
 
 
-def is_property(obj: object, attribute: str) -> bool:
+def is_property(obj: object, attr: str) -> bool:
     """Determine if a class attribute is a property.
 
     Args:
         obj: The object to check.
-        attribute: The attribute name to check on the object.
+        attr: The attribute name to check on the object.
 
     Returns:
         True if the attribute is a property, False otherwise.
     """
-    return hasattr(obj.__class__, attribute) and isinstance(
-        getattr(obj.__class__, attribute), property
-    )
+    if not hasattr(obj.__class__, attr):
+        return False
+    if isinstance(obj, type):
+        return isinstance(getattr(obj, attr), property)
+    else:
+        return isinstance(getattr(obj.__class__, attr), property)
+
+
+def is_method(obj: Any, attr: str) -> bool:
+    if isinstance(obj, type):
+        return inspect.ismethod(getattr(obj, attr, None))
+    else:
+        return inspect.ismethod(getattr(obj.__class__, attr, None))
 
 
 def dict_zip_intersection(*dicts: dict) -> Generator[tuple[Any, ...], None, None]:
@@ -130,6 +140,12 @@ def in_jupyter() -> bool:
         return False
 
 
+def _fix_path(path: str) -> str:
+    return (
+        str(path).replace("\\", "/").replace(r"\"", "/").replace("//", "/").rstrip("/")
+    )
+
+
 def get_all_files(root: str, recursive: bool = True) -> list[str]:
     """Fetch all files in a directory.
 
@@ -141,11 +157,11 @@ def get_all_files(root: str, recursive: bool = True) -> list[str]:
         A list of file paths.
     """
     if not recursive:
-        return [path for path in glob.glob(str(Path(root)) + "/**")]
+        return [_fix_path(path) for path in glob.glob(str(Path(root)) + "/**")]
     paths = []
     for root_dir, _, files in os.walk(root):
         for file in files:
-            path = os.path.join(root_dir, file)
+            path = _fix_path(os.path.join(root_dir, file))
             paths.append(path)
     return paths
 

sgis/maps/explore.py

@@ -144,8 +144,8 @@ def to_tile(tile: str | xyzservices.TileProvider, max_zoom: int) -> folium.TileL
         "openstreetmap": folium.TileLayer(
             "OpenStreetMap", min_zoom=0, max_zoom=max_zoom
         ),
-        "grunnkart": kartverket.norges_grunnkart,
-        "gråtone": kartverket.norges_grunnkart_gråtone,
+        "grunnkart": kartverket.topo,
+        "gråtone": kartverket.topogråtone,
         "norge_i_bilder": kartverket.norge_i_bilder,
         "dark": xyz.CartoDB.DarkMatter,
         "voyager": xyz.CartoDB.Voyager,
@@ -194,8 +194,6 @@ def _single_band_to_arr(band, mask, name, raster_data_dict):
             gpd.GeoSeries(box(*band.bounds), crs=band.crs).to_crs(4326).geometry.values
         ).bounds
     )
-    # if np.max(arr) > 0:
-    #     arr = arr / 255
     try:
         raster_data_dict["cmap"] = band.get_cmap(arr)
     except Exception:
@@ -216,11 +214,11 @@ class Explore(Map):
     """Class for displaying and saving html maps of multiple GeoDataFrames."""
 
     # class attribute that can be overridden locally
-    tiles: ClassVar[tuple[str]] = (
-        "OpenStreetMap",
-        "dark",
+    tiles: ClassVar[tuple[str, ...]] = (
+        "grunnkart",
         "norge_i_bilder",
-        # "grunnkart",
+        "dark",
+        "OpenStreetMap",
     )
 
     def __init__(
@@ -533,8 +531,6 @@ class Explore(Map):
                 arr = arr.data
             if "bool" in str(arr.dtype):
                 arr = np.where(arr, 1, 0)
-            # if np.max(arr[~np.isnan(arr)]) > 255:
-            #     arr = (arr - np.min(arr)) / (np.max(arr) - np.min(arr))
             try:
                 arr = (arr - np.min(arr)) / (np.max(arr) - np.min(arr))
             except Exception:
@@ -1182,28 +1178,17 @@ class Explore(Map):
                 break
 
             crs = red_band.crs
-
-            bounds: tuple = (
-                _any_to_bbox_crs4326(mask, crs)
-                if mask is not None
-                else (
-                    union_all(
-                        gpd.GeoSeries(box(*red_band.bounds), crs=crs)
-                        .to_crs(4326)
-                        .geometry.values
-                    ).bounds
-                )
-            )
+            bounds = to_bbox(to_gdf(red_band.bounds, crs).to_crs(4326))
 
             red_band = red_band.values
             blue_band = blue_band.values
             green_band = green_band.values
 
-            if red_band.shape[0] == 0:
-                continue
-            if blue_band.shape[0] == 0:
-                continue
-            if green_band.shape[0] == 0:
+            if (
+                red_band.shape[0] == 0
+                or blue_band.shape[0] == 0
+                or green_band.shape[0] == 0
+            ):
                 continue
 
             # to 3d array in shape (x, y, 3)
@@ -1268,16 +1253,10 @@ def _determine_label(
         )
         if does_not_have_generic_name:
             return obj_name
-    # try:
-    #     if obj.tile and obj.date:
-    #         name = f"{obj.tile}_{obj.date[:8]}"
-    # except (ValueError, AttributeError):
-    #     name = None
-
     try:
         # Images/Bands/Collections constructed from arrays have no path stems
-        if obj.stem:
-            name = obj.stem
+        if obj.name:
+            name = obj.name
         else:
             name = str(obj)[:23]
     except (AttributeError, ValueError):

sgis/maps/map.py

@@ -14,7 +14,11 @@ import numpy as np
 import pandas as pd
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
-from jenkspy import jenks_breaks
+
+try:
+    from jenkspy import jenks_breaks
+except ImportError:
+    pass
 from mapclassify import classify
 from pandas.errors import PerformanceWarning
 from shapely import Geometry

sgis/maps/tilesources.py

@@ -3,45 +3,27 @@ from xyzservices import TileProvider
 from xyzservices import providers
 
 kartverket = Bunch(
-    norgeskart=TileProvider(
-        name="Norgeskart",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=norgeskart_bakgrunn&zoom={z}&x={x}&y={y}",
-        attribution="© Kartverket",
-        html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
-    ),
-    bakgrunnskart_forenklet=TileProvider(
-        name="Norgeskart forenklet",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=bakgrunnskart_forenklet&zoom={z}&x={x}&y={y}",
-        attribution="© Kartverket",
-        html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
-    ),
-    norges_grunnkart=TileProvider(
-        name="Norges grunnkart",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=norges_grunnkart&zoom={z}&x={x}&y={y}",
-        attribution="© Kartverket",
-        html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
-    ),
-    norges_grunnkart_gråtone=TileProvider(
-        name="Norges grunnkart gråtone",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=norges_grunnkart_graatone&zoom={z}&x={x}&y={y}",
-        attribution="© Kartverket",
-        html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
-    ),
-    n50=TileProvider(
-        name="N5 til N50 kartdata",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=kartdata3&zoom={z}&x={x}&y={y}",
+    topo=TileProvider(
+        name="Topografisk norgeskart",
+        url="https://cache.kartverket.no/v1/wmts/1.0.0/topo/default/webmercator/{z}/{y}/{x}.png",
         attribution="© Kartverket",
         html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
     ),
     topogråtone=TileProvider(
         name="Topografisk norgeskart gråtone",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo4graatone&zoom={z}&x={x}&y={y}",
+        url="https://cache.kartverket.no/v1/wmts/1.0.0/topograatone/default/webmercator/{z}/{y}/{x}.png",
         attribution="© Kartverket",
         html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
     ),
     toporaster=TileProvider(
         name="Topografisk raster",
-        url="https://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=toporaster4&zoom={z}&x={x}&y={y}",
+        url="https://cache.kartverket.no/v1/wmts/1.0.0/toporaster/default/webmercator/{z}/{y}/{x}.png",
+        attribution="© Kartverket",
+        html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
+    ),
+    sjøkart=TileProvider(
+        name="Sjøkart",
+        url="https://cache.kartverket.no/v1/wmts/1.0.0/sjokartraster/default/webmercator/{z}/{y}/{x}.png",
         attribution="© Kartverket",
         html_attribution='&copy; <a href="https://kartverket.no">Kartverket</a>',
     ),

sgis/raster/base.py

@@ -189,30 +189,6 @@ def _gdf_to_geojson_with_col(gdf: GeoDataFrame, values: np.ndarray) -> list[dict
         ]
 
 
-def _shapely_to_raster(
-    geometry: Geometry,
-    res: int | float,
-    fill: int = 0,
-    all_touched: bool = False,
-    merge_alg: Callable = MergeAlg.replace,
-    default_value: int = 1,
-    dtype: Any | None = None,
-) -> np.array:
-    shape = _get_shape_from_bounds(geometry.bounds, res=res, indexes=1)
-    transform = _get_transform_from_bounds(geometry.bounds, shape)
-
-    return features.rasterize(
-        [(geometry, default_value)],
-        out_shape=shape,
-        transform=transform,
-        fill=fill,
-        all_touched=all_touched,
-        merge_alg=merge_alg,
-        default_value=default_value,
-        dtype=dtype,
-    )
-
-
 @contextmanager
 def memfile_from_array(array: np.ndarray, **profile) -> rasterio.MemoryFile:
     """Yield a memory file from a numpy array."""
@@ -228,33 +204,3 @@ def get_index_mapper(df: pd.DataFrame) -> tuple[dict[int, int], str]:
     idx_mapper = dict(enumerate(df.index))
     idx_name = df.index.name
     return idx_mapper, idx_name
-
-
-NESSECARY_META = [
-    "path",
-    "type",
-    "bounds",
-    "crs",
-]
-
-PROFILE_ATTRS = [
-    "driver",
-    "dtype",
-    "nodata",
-    "crs",
-    "height",
-    "width",
-    "blockysize",
-    "blockxsize",
-    "tiled",
-    "compress",
-    "interleave",
-    "count",  # TODO: this should be based on band_index / array depth, so will have no effect
-    "indexes",  # TODO
-]
-
-ALLOWED_KEYS = (
-    NESSECARY_META
-    + PROFILE_ATTRS
-    + ["array", "res", "transform", "name", "date", "regex"]
-)