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

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.8"
+version = "1.2.10"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -67,6 +67,8 @@ mypy = ">=0.930"
 pre-commit = ">=2.16.0"
 pre-commit-hooks = ">=4.1.0"
 ruff = ">=0.0.284"
+owslib = ">=0.34.0"
+pillow = ">=11.0.0"
 pytest = ">=6.2.5"
 sphinx = ">=6.2.1"
 sphinx-autobuild = ">=2021.3.14"

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

@@ -466,7 +466,8 @@ def write_geopandas(
             df.geometry = None
         try:
             with file_system.open(gcs_path, "wb") as file:
-                df.to_parquet(file, **kwargs)
+                _to_geopandas(df, file, **kwargs)
+
         except Exception as e:
             more_txt = PANDAS_FALLBACK_INFO if not pandas_fallback else ""
             raise e.__class__(
@@ -486,7 +487,7 @@ def write_geopandas(
                 **kwargs,
             )
         with file_system.open(gcs_path, mode="wb") as file:
-            df.to_parquet(file, **kwargs)
+            _to_geopandas(df, file, **kwargs)
         return
 
     layer = kwargs.pop("layer", None)

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

@@ -132,7 +132,7 @@ class NorgeIBilderWms(WmsLoader):
 
                 all_tiles.append(this_tile)
 
-        self.tiles = sorted(all_tiles, key=lambda x: x["year"])
+        self.tiles = sorted(all_tiles, key=lambda x: (x["year"]))
 
         masks = self._get_norge_i_bilder_polygon_masks(verbose=verbose)
         for tile in self.tiles:
@@ -296,14 +296,13 @@ class NorgeIBilderWms(WmsLoader):
     def __post_init__(self) -> None:
         """Fix typings."""
         if self.contains and isinstance(self.contains, str):
-            self.contains = [self.contains.lower()]
+            self.contains = [self.contains]
         elif self.contains:
-            self.contains = [x.lower() for x in self.contains]
-
+            self.contains = [x for x in self.contains]
         if self.not_contains and isinstance(self.not_contains, str):
-            self.not_contains = [self.not_contains.lower()]
+            self.not_contains = [self.not_contains]
         elif self.not_contains:
-            self.not_contains = [x.lower() for x in self.not_contains]
+            self.not_contains = [x for x in self.not_contains]
 
         self.years = [str(int(year)) for year in self.years]