ssb-sgis 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

sgis/geopandas_tools/duplicates.py

@@ -185,6 +185,7 @@ def get_intersections(
     geom_type: str | None = None,
     keep_geom_type: bool | None = None,
     predicate: str | None = "intersects",
+    grid_size: float | None = None,
     n_jobs: int = 1,
 ) -> GeoDataFrame:
     """Find geometries that intersect in a GeoDataFrame.
@@ -204,6 +205,8 @@ def get_intersections(
         keep_geom_type: Whether to keep the original geometry type.
             If mixed geometry types and keep_geom_type=True,
             an exception is raised.
+        grid_size: Precision grid size to round the geometries. Will use the highest
+            precision of the inputs by default.
         n_jobs: Number of threads.
         predicate: Spatial predicate for the spatial tree.
 
@@ -279,6 +282,7 @@ def get_intersections(
         geom_type,
         keep_geom_type,
         n_jobs=n_jobs,
+        grid_size=grid_size,
         predicate=predicate,
     ).pipe(clean_geoms)
 
@@ -296,7 +300,8 @@ def _get_intersecting_geometries(
     geom_type: str | None,
     keep_geom_type: bool,
     n_jobs: int,
-    predicate: str | None,
+    grid_size: float | None = None,
+    predicate: str | None = None,
 ) -> GeoDataFrame:
     right = gdf[[gdf._geometry_column_name]]
     right["idx_right"] = right.index
@@ -317,6 +322,7 @@ def _get_intersecting_geometries(
             right,
             how="intersection",
             predicate=predicate,
+            grid_size=grid_size,
             geom_type=geom_type,
             keep_geom_type=keep_geom_type,
             n_jobs=n_jobs,
@@ -336,6 +342,7 @@ def _get_intersecting_geometries(
                     left,
                     right,
                     how="intersection",
+                    grid_size=grid_size,
                     predicate=predicate,
                     geom_type=geom_type,
                     n_jobs=n_jobs,
@@ -348,6 +355,7 @@ def _get_intersecting_geometries(
         # large and very detailed geometries can dissappear with small negative buffer
         simplify(intersected.geometry, 1e-3)
         .buffer(-1e-3)
+        # intersected.geometry
         .representative_point()
         .to_frame()
         .sjoin(intersected)
@@ -359,13 +367,19 @@ def _get_intersecting_geometries(
         columns=["idx_left", "idx_right"]
     )
 
-    # some polygons within polygons are not counted in the
+    # return out
+
+    # some polygons within polygons are not counted in the intersection
     within = (
         gdf.assign(_range_idx_inters_left=lambda x: range(len(x)))
         .sjoin(
             GeoDataFrame(
                 {
-                    "geometry": gdf.buffer(1e-6).values,
+                    # "geometry": polygons(
+                    #     get_exterior_ring(gdf.geometry.values)
+                    # ),  # buffer(1e-6).values)),
+                    "geometry": gdf.geometry.values,
+                    # "geometry": buffer(simplify(gdf.geometry.values, 1e-3), 1e-6),
                     "_range_idx_inters_right": range(len(gdf)),
                 },
                 crs=gdf.crs,

sgis/helpers.py

@@ -13,6 +13,28 @@ import numpy as np
 import pandas as pd
 from geopandas import GeoDataFrame
 
+try:
+    from fsspec.spec import AbstractFileSystem
+except ImportError:
+
+    class AbstractFileSystem:
+        """Placeholder."""
+
+
+from .conf import config
+
+
+def _get_file_system(
+    file_system: None | AbstractFileSystem, kwargs: dict
+) -> AbstractFileSystem:
+    if (
+        file_system is not None and "filesystem" in kwargs or "file_system" in kwargs
+    ) or ("filesystem" in kwargs and "file_system" in kwargs):
+        raise ValueError("Cannot pass both filesystem and file_system.")
+    file_system2 = kwargs.pop("file_system", None)
+    file_system3 = kwargs.pop("filesystem", None)
+    return file_system or file_system2 or file_system3 or config["file_system"]()
+
 
 def get_numpy_func(text: str, error_message: str | None = None) -> Callable:
     """Fetch a numpy function based on its name.

sgis/io/__init__.py

@@ -0,0 +1,6 @@
+try:
+    from .dapla_functions import _read_pandas
+    from .dapla_functions import read_geopandas
+    from .dapla_functions import write_geopandas
+except ImportError:
+    pass