ssb-sgis 1.0.7__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]:

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,
@@ -214,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__(

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/image_collection.py

@@ -95,6 +95,8 @@ from ..geopandas_tools.general import get_common_crs
 from ..helpers import _fix_path
 from ..helpers import get_all_files
 from ..helpers import get_numpy_func
+from ..helpers import is_method
+from ..helpers import is_property
 from ..io._is_dapla import is_dapla
 from ..io.opener import opener
 from . import sentinel_config as config
@@ -164,6 +166,7 @@ ALLOWED_INIT_KWARGS = [
     "backend",
     "masking",
     "_merged",
+    "date",
 ]
 
 _load_counter: int = 0
@@ -319,7 +322,7 @@ class _ImageBase:
         self._bounds = None
         self._merged = False
         self._from_array = False
-        self._from_gdf = False
+        self._from_geopandas = False
         self.metadata_attributes = self.metadata_attributes or {}
         self._path = None
         self._metadata_from_xml = False
@@ -328,32 +331,30 @@ class _ImageBase:
 
         self.metadata = self._metadata_to_nested_dict(metadata)
 
-        if self.filename_regexes:
-            if isinstance(self.filename_regexes, str):
-                self.filename_regexes = (self.filename_regexes,)
-            self.filename_patterns = [
-                re.compile(regexes, flags=re.VERBOSE)
-                for regexes in self.filename_regexes
-            ]
-        else:
-            self.filename_patterns = ()
-
-        if self.image_regexes:
-            if isinstance(self.image_regexes, str):
-                self.image_regexes = (self.image_regexes,)
-            self.image_patterns = [
-                re.compile(regexes, flags=re.VERBOSE) for regexes in self.image_regexes
-            ]
-        else:
-            self.image_patterns = ()
+        self.image_patterns = self._compile_regexes("image_regexes")
+        self.filename_patterns = self._compile_regexes("filename_regexes")
 
         for key, value in kwargs.items():
+            error_obj = ValueError(
+                f"{self.__class__.__name__} got an unexpected keyword argument '{key}'"
+            )
             if key in ALLOWED_INIT_KWARGS and key in dir(self):
-                setattr(self, key, value)
+                if is_property(self, key):
+                    setattr(self, f"_{key}", value)
+                elif is_method(self, key):
+                    raise error_obj
+                else:
+                    setattr(self, key, value)
             else:
-                raise ValueError(
-                    f"{self.__class__.__name__} got an unexpected keyword argument '{key}'"
-                )
+                raise error_obj
+
+    def _compile_regexes(self, regex_attr: str) -> tuple[re.Pattern]:
+        regexes = getattr(self, regex_attr)
+        if regexes:
+            if isinstance(regexes, str):
+                regexes = (regexes,)
+            return tuple(re.compile(regexes, flags=re.VERBOSE) for regexes in regexes)
+        return ()
 
     @staticmethod
     def _metadata_to_nested_dict(
@@ -367,6 +368,7 @@ class _ImageBase:
         if isinstance(metadata, pd.DataFrame):
 
             def is_scalar(x) -> bool:
+                """Check if scalar because 'truth value of Series is ambigous'."""
                 return not hasattr(x, "__len__") or len(x) <= 1
 
             def na_to_none(x) -> None:
@@ -631,12 +633,24 @@ class _ImageBandBase(_ImageBase):
 
     def _to_xarray(self, array: np.ndarray, transform: Affine) -> DataArray:
         """Convert the raster to  an xarray.DataArray."""
+        attrs = {"crs": self.crs}
+        for attr in set(self.metadata_attributes).union({"date"}):
+            try:
+                attrs[attr] = getattr(self, attr)
+            except Exception:
+                pass
+
         if len(array.shape) == 2:
             height, width = array.shape
             dims = ["y", "x"]
         elif len(array.shape) == 3:
             height, width = array.shape[1:]
             dims = ["band", "y", "x"]
+        elif not any(dim for dim in array.shape):
+            DataArray(
+                name=self.name or self.__class__.__name__,
+                attrs=attrs,
+            )
         else:
             raise ValueError(
                 f"Array should be 2 or 3 dimensional. Got shape {array.shape}"
@@ -644,13 +658,6 @@ class _ImageBandBase(_ImageBase):
 
         coords = _generate_spatial_coords(transform, width, height)
 
-        attrs = {"crs": self.crs}
-        for attr in set(self.metadata_attributes).union({"date"}):
-            try:
-                attrs[attr] = getattr(self, attr)
-            except Exception:
-                pass
-
         return DataArray(
             array,
             coords=coords,
@@ -667,7 +674,7 @@ class Band(_ImageBandBase):
     backend: str = "numpy"
 
     @classmethod
-    def from_gdf(
+    def from_geopandas(
         cls,
         gdf: GeoDataFrame | GeoSeries,
         res: int,
@@ -691,7 +698,7 @@ class Band(_ImageBandBase):
         )
 
         obj = cls(arr, res=res, crs=gdf.crs, bounds=gdf.total_bounds, **kwargs)
-        obj._from_gdf = True
+        obj._from_geopandas = True
         return obj
 
     def __init__(
@@ -839,12 +846,18 @@ class Band(_ImageBandBase):
     @property
     def height(self) -> int:
         """Pixel heigth of the image band."""
-        return self.values.shape[-2]
+        try:
+            return self.values.shape[-2]
+        except IndexError:
+            return 0
 
     @property
     def width(self) -> int:
         """Pixel width of the image band."""
-        return self.values.shape[-1]
+        try:
+            return self.values.shape[-1]
+        except IndexError:
+            return 0
 
     @property
     def tile(self) -> str:
@@ -892,7 +905,7 @@ class Band(_ImageBandBase):
         copied = self.copy()
         value_must_be_at_least = np.sort(np.ravel(copied.values))[-n] - (precision or 0)
         copied._values = np.where(copied.values >= value_must_be_at_least, 1, 0)
-        df = copied.to_gdf(column).loc[lambda x: x[column] == 1]
+        df = copied.to_geopandas(column).loc[lambda x: x[column] == 1]
         df[column] = f"largest_{n}"
         return df
 
@@ -903,7 +916,7 @@ class Band(_ImageBandBase):
         copied = self.copy()
         value_must_be_at_least = np.sort(np.ravel(copied.values))[n] - (precision or 0)
         copied._values = np.where(copied.values <= value_must_be_at_least, 1, 0)
-        df = copied.to_gdf(column).loc[lambda x: x[column] == 1]
+        df = copied.to_geopandas(column).loc[lambda x: x[column] == 1]
         df[column] = f"smallest_{n}"
         return df
 
@@ -911,6 +924,9 @@ class Band(_ImageBandBase):
         self, mask: GeoDataFrame | GeoSeries | Polygon | MultiPolygon, **kwargs
     ) -> "Band":
         """Clip band values to geometry mask."""
+        if not self.height or not self.width:
+            return self
+
         values = _clip_xarray(
             self.to_xarray(),
             mask,
@@ -978,7 +994,6 @@ class Band(_ImageBandBase):
         if self.has_array and [int(x) for x in bounds] != [int(x) for x in self.bounds]:
             print(self)
             print(self.mask)
-            print(self.mask.values.shape)
             print(self.values.shape)
             print([int(x) for x in bounds], [int(x) for x in self.bounds])
             raise ValueError(
@@ -1284,7 +1299,7 @@ class Band(_ImageBandBase):
             dropna=dropna,
         )
 
-    def to_gdf(self, column: str = "value") -> GeoDataFrame:
+    def to_geopandas(self, column: str = "value") -> GeoDataFrame:
         """Create a GeoDataFrame from the image Band.
 
         Args:
@@ -1328,17 +1343,35 @@ class Band(_ImageBandBase):
         self, arr: np.ndarray | DataArray, masked: bool = True
     ) -> np.ndarray | np.ma.core.MaskedArray:
         if not isinstance(arr, np.ndarray):
+            mask_arr = None
             if masked:
+                # if self.mask is not None:
+                #     print(self.mask.values.shape, arr.shape)
+                # if self.mask is not None and self.mask.values.shape == arr.shape:
+                #     print("hei", self.mask.values.sum())
+                #     mask_arr = self.mask.values
+                # else:
+                #     mask_arr = np.full(arr.shape, False)
+                # try:
+                #     print("hei222", arr.isnull().values.sum())
+                #     mask_arr |= arr.isnull().values
+                # except AttributeError:
+                #     pass
+                # mask_arr = np.full(arr.shape, False)
                 try:
                     mask_arr = arr.isnull().values
                 except AttributeError:
-                    mask_arr = np.full(arr.shape, False)
+                    pass
             try:
                 arr = arr.to_numpy()
             except AttributeError:
                 arr = arr.values
+            if mask_arr is not None:
+                arr = np.ma.array(arr, mask=mask_arr, fill_value=self.nodata)
+
         if not isinstance(arr, np.ndarray):
             arr = np.array(arr)
+
         if (
             masked
             and self.mask is not None
@@ -1750,10 +1783,10 @@ class Image(_ImageBandBase):
                 bounds.append(band.bounds)
             return get_total_bounds(bounds)
 
-    def to_gdf(self, column: str = "value") -> GeoDataFrame:
+    def to_geopandas(self, column: str = "value") -> GeoDataFrame:
         """Convert the array to a GeoDataFrame of grid polygons and values."""
         return pd.concat(
-            [band.to_gdf(column=column) for band in self], ignore_index=True
+            [band.to_geopandas(column=column) for band in self], ignore_index=True
         )
 
     def sample(
@@ -2491,7 +2524,7 @@ class ImageCollection(_ImageBase):
         return xr.combine_by_coords(list(xarrs.values()))
         # return Dataset(xarrs)
 
-    def to_gdfs(self, column: str = "value") -> dict[str, GeoDataFrame]:
+    def to_geopandas(self, column: str = "value") -> dict[str, GeoDataFrame]:
         """Convert each band in each Image to a GeoDataFrame."""
         out = {}
         i = 0
@@ -2504,7 +2537,7 @@ class ImageCollection(_ImageBase):
                     name = f"{self.__class__.__name__}({i})"
 
                 if name not in out:
-                    out[name] = band.to_gdf(column=column)
+                    out[name] = band.to_geopandas(column=column)
         return out
 
     def sample(self, n: int = 1, size: int = 500) -> "ImageCollection":
@@ -3257,7 +3290,7 @@ class PathlessImageError(ValueError):
             what = "that have been merged"
         elif self.instance._from_array:
             what = "from arrays"
-        elif self.instance._from_gdf:
+        elif self.instance._from_geopandas:
             what = "from GeoDataFrames"
         else:
             raise ValueError(self.instance)

{ssb_sgis-1.0.7.dist-info → ssb_sgis-1.0.8.dist-info}/METADATA

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

{ssb_sgis-1.0.7.dist-info → ssb_sgis-1.0.8.dist-info}/RECORD

@@ -17,20 +17,20 @@ sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9h
 sgis/geopandas_tools/polygon_operations.py,sha256=FJ-dXCxLHRsmp0oXsmBOFRprFFwmhrxqOPZkW2WWWQM,50088
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
 sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhmeZY,9345
-sgis/helpers.py,sha256=dn990VGhXXBzOt5Ul8zLgK-s21VFK82A2jhc8rw8xNs,8490
+sgis/helpers.py,sha256=3NqPfVBKlZcZTiMJrsTAlDv5tNKDHrJr_8NimutVzQg,8797
 sgis/io/_is_dapla.py,sha256=o_qFD5GOi3dsSGOKmW6R8wZU0htVwFgRbGX7ppJCqT4,431
 sgis/io/dapla_functions.py,sha256=8dfxBtkGUy7vltlKydXkathBsSd9DPHVIDIOe-Ctjsg,18180
 sgis/io/opener.py,sha256=BHyH7L8Ubh9C4Lsb8eBzGI6FLWg8UQFu-1bg3NEy_2k,862
 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=gpYOKSHz-Yx8FkJJ6adkfBN2j351dPumKw6JVoXmMlQ,45555
+sgis/maps/explore.py,sha256=mbSKFynLklJ3g4YfZJMDUo4K7Lg3sDoXDtnJ0l4L51w,45533
 sgis/maps/httpserver.py,sha256=7Od9JMCtntcIQKk_TchetojMHzFHT9sPw7GANahI97c,1982
 sgis/maps/legend.py,sha256=1ZOhzftq1HRKlHphhfqUm82U-Kjx_xkACieLRevxke8,26232
 sgis/maps/map.py,sha256=4znVxefW2wVe_LSmGAVcJQxf3oF_6aAyppNo4EyYJH4,29431
 sgis/maps/maps.py,sha256=HbKG1OHkSFYZ2dpgpag6H-LY1tOtZKaZncNNrBQpkU4,23127
 sgis/maps/thematicmap.py,sha256=bFlZy2xSKmEOHhvM0d1pv8O9JuNjR3P_9colTJnduvE,20729
-sgis/maps/tilesources.py,sha256=aSci-0JURxnqqirIXQS5bHfNEIg3xfCM_B4gXs7GslM,2772
+sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=9I3t9pnccUPr4mozy3TJCOpGCCf3UOIojmsbifubZbA,6368
 sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
@@ -49,12 +49,12 @@ sgis/parallel/parallel.py,sha256=SlC_mOwvSSyWTKUcxLMGkuWHUkEC6dXTlN0Jn5cAtxA,396
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/base.py,sha256=Bdd30DS0iIv7fo93vrFoEBGC7a5PFaBXT46fcHwgORY,6558
-sgis/raster/image_collection.py,sha256=BSibIsuKAznMHfh23E9CMfLoyvF1gfjg418GF-aPRGA,116998
+sgis/raster/image_collection.py,sha256=XrQddJgpP-R0KeLEWeqsOBOaMExA9lCt0_5rR7tXku8,118307
 sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
 sgis/raster/regex.py,sha256=I7pTAYNoOFgcPRLllR4jGMhmRk8AkOgm1D38fDSFnlg,3745
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=st2mWiUcdxeEiHBOZSgFOnVcP6pc4EMPJBPw537Z4V8,3837
-ssb_sgis-1.0.7.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.0.7.dist-info/METADATA,sha256=YnVqRt72kwWk0l5L2kvRn1SMigUasE1MP3oDI68UZsY,11772
-ssb_sgis-1.0.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.0.7.dist-info/RECORD,,
+ssb_sgis-1.0.8.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.0.8.dist-info/METADATA,sha256=9Q_QyG0VOQAy9uhAi1kX64dVgb6AJ2xWwG91B_r_Nxo,11772
+ssb_sgis-1.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.0.8.dist-info/RECORD,,