Merge pull request #308 from statisticsnorway/map-hatches

fjerne dapla-toolbelt. Og fikse index-bug hvis 0 rader

Author: mortewle

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.3.2"
+version = "1.3.3"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -45,12 +45,11 @@ xyzservices = ">=2023.2.0"
 dask = { version = ">=2024.1.1", optional = true }
 xarray = { version = ">=2024.3.0", optional = true }
 rioxarray = { version = ">=0.15.5", optional = true }
-dapla-toolbelt = { version = ">=3.0.1", optional = true }
 gcsfs = { version = ">=2024.3.1", optional = true }
 
 [tool.poetry.extras]
-all = ["pyogrio", "xarray", "rioxarray", "dapla-toolbelt", "gcsfs", "dask"]
-bucket = ["dapla-toolbelt", "gcsfs"]
+all = ["pyogrio", "xarray", "rioxarray", "gcsfs", "dask"]
+bucket = ["gcsfs"]
 xarray = ["xarray", "rioxarray"]
 test = ["xarray", "rioxarray", "dask"]
 

src/sgis/geopandas_tools/overlay.py

@@ -268,6 +268,8 @@ def _shapely_pd_overlay(
     left, right = rtree_runner.run(
         df1.geometry.values, df2.geometry.values, predicate=predicate
     )
+    left = left.astype(int)
+    right = right.astype(int)
     pairs = _get_intersects_pairs(df1, df2, left, right, rsuffix)
     assert pairs["geometry"].notna().all(), pairs.geometry[lambda x: x.isna()]
     assert pairs["geom_right"].notna().all(), pairs.geom_right[lambda x: x.isna()]

src/sgis/io/dapla_functions.py

@@ -355,7 +355,7 @@ def get_bounds_series(
     Examples:
     ---------
     >>> import sgis as sg
-    >>> import dapla as dp
+    >>> from gcsfs import GCSFileSystem
     >>> all_paths =  GCSFileSystem().ls("...")
 
     Get the bounds of all your file paths, indexed by path.

src/sgis/io/opener.py

@@ -5,8 +5,7 @@
 from typing import Any
 
 try:
-    from dapla import FileClient
-    from dapla.gcs import GCSFileSystem
+    from gcsfs import GCSFileSystem
 except ImportError:
 
     class GCSFileSystem:  # type: ignore[no-redef]
@@ -30,7 +29,7 @@ def opener(
     """
     if is_dapla():
         if file_system is None:
-            file_system = FileClient.get_gcs_file_system()
+            file_system = GCSFileSystem()
         yield file_system.open(str(path), mode=mode)
     else:
         yield str(path)