ssb-sgis 1.0.2__tar.gz → 1.0.4__tar.gz

{ssb_sgis-1.0.2 → ssb_sgis-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.0.2
+Version: 1.0.4
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
@@ -21,12 +21,10 @@ Provides-Extra: torch
 Provides-Extra: xarray
 Requires-Dist: affine (>=2.4.0)
 Requires-Dist: branca (>=0.6.0)
-Requires-Dist: dapla-toolbelt (>=2.0.12) ; extra == "all" or extra == "bucket"
-Requires-Dist: dask (>=2024.1.1)
-Requires-Dist: dask-geopandas (>=0.3.0)
+Requires-Dist: dapla-toolbelt (>=3.0.1) ; extra == "all" or extra == "bucket"
+Requires-Dist: dask (>=2024.1.1) ; extra == "all" or extra == "test"
 Requires-Dist: folium (>=0.14.0)
 Requires-Dist: gcsfs (>=2024.3.1) ; extra == "all" or extra == "bucket"
-Requires-Dist: geocoder (>=1.38.1)
 Requires-Dist: geopandas (>=0.14.0)
 Requires-Dist: igraph (>=0.11.2)
 Requires-Dist: ipython (>=8.13.2)
@@ -36,7 +34,8 @@ Requires-Dist: joblib (>=1.4.0)
 Requires-Dist: mapclassify (>=2.5.0)
 Requires-Dist: matplotlib (>=3.7.0)
 Requires-Dist: networkx (>=3.0)
-Requires-Dist: numpy (>=1.24.2)
+Requires-Dist: numba (>=0.60.0)
+Requires-Dist: numpy (>=1.26.4)
 Requires-Dist: pandas (>=2.2.1)
 Requires-Dist: pyarrow (>=11.0.0)
 Requires-Dist: pyproj (>=3.6.1)
@@ -46,7 +45,7 @@ Requires-Dist: rioxarray (>=0.15.5) ; extra == "all" or extra == "xarray" or ext
 Requires-Dist: rtree (>=1.0.1)
 Requires-Dist: scikit-learn (>=1.2.1)
 Requires-Dist: shapely (>=2.0.1)
-Requires-Dist: torch (==2.2.2) ; extra == "all" or extra == "torch" or extra == "test"
+Requires-Dist: torch (>=2.4.0) ; extra == "all" or extra == "torch" or extra == "test"
 Requires-Dist: torchgeo (>=0.5.2) ; extra == "all" or extra == "torch" or extra == "test"
 Requires-Dist: typing-extensions (>=4.11.0)
 Requires-Dist: xarray (>=2024.3.0) ; extra == "all" or extra == "xarray" or extra == "test"

{ssb_sgis-1.0.2 → ssb_sgis-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.0.2"
+version = "1.0.4"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"
@@ -21,10 +21,8 @@ Changelog = "https://github.com/statisticsnorway/ssb-sgis/releases"
 python = ">=3.10,<4"
 affine = ">=2.4.0"
 branca = ">=0.6.0"
-dask = ">=2024.1.1"
-dask-geopandas = ">=0.3.0"
+dask = { version = ">=2024.1.1", optional = true }
 folium = ">=0.14.0"
-geocoder = ">=1.38.1"
 geopandas = ">=0.14.0"
 igraph = ">=0.11.2"
 ipython = ">=8.13.2"
@@ -34,7 +32,8 @@ joblib = ">=1.4.0"
 mapclassify = ">=2.5.0"
 matplotlib = ">=3.7.0"
 networkx = ">=3.0"
-numpy = ">=1.24.2"
+numba = { version = ">=0.60.0", optional = true }
+numpy = ">=1.26.4"
 pandas = ">=2.2.1"
 pyarrow = ">=11.0.0"
 pyproj = ">=3.6.1"
@@ -47,18 +46,17 @@ typing-extensions = ">=4.11.0"
 xyzservices = ">=2023.2.0"
 xarray = { version = ">=2024.3.0", optional = true }
 rioxarray = { version = ">=0.15.5", optional = true }
-torch = { version = "==2.2.2", optional = true }  # Until this is fixed https://github.com/pytorch/pytorch/issues/124897
+torch = { version = ">=2.4.0", optional = true }
 torchgeo = { version = ">=0.5.2", optional = true }
-dapla-toolbelt = { version = ">=2.0.12", optional = true }
+dapla-toolbelt = { version = ">=3.0.1", optional = true }
 gcsfs = { version = ">=2024.3.1", optional = true }
 
 [tool.poetry.extras]
-all = ["pyogrio", "xarray", "rioxarray", "torch", "torchgeo", "dapla-toolbelt", "gcsfs"]
+all = ["pyogrio", "xarray", "rioxarray", "torch", "torchgeo", "dapla-toolbelt", "gcsfs", "dask"]
 bucket = ["dapla-toolbelt", "gcsfs"]
 torch = ["torch", "torchgeo"]
 xarray = ["xarray", "rioxarray"]
-test = ["xarray", "rioxarray", "torch", "torchgeo"]
-
+test = ["xarray", "rioxarray", "torch", "torchgeo", "dask"]
 [tool.poetry.group.dev.dependencies]
 pygments = ">=2.10.0"
 black = { extras = ["jupyter"], version = ">=23.1.0" }
@@ -84,7 +82,8 @@ jupytext = ">=1.16.1"
 pytest-cov = ">=5.0.0"
 pandas-stubs = ">=2.2.1.240316"
 types-requests = ">=2.31.0.20240406"
-
+# bitsandbytes not released for macos for version > 0.42
+bitsandbytes = { version = "0.42.0", markers = "sys_platform == 'darwin'" }
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
@@ -114,7 +113,6 @@ module = [
     "affine.*",
     "branca.*",
     "dapla.*",
-    "dask_geopandas.*",
     "folium.*",
     "gcsfs.*",
     "geocoder.*",
@@ -180,6 +178,7 @@ ignore = [
     "ANN001", # TODO temporary. Missing type annotation for function argument ...
     "D103",   # TODO temporary. Missing docstring in public function
     "B018",   # Found useless expression
+    "E712",   # Avoid equality comparisons to `True`; use `if x:` for truth checks (because 'is' doesn't work with numpy/pandas)
 ]
 
 [tool.ruff.lint.isort]

{ssb_sgis-1.0.2 → ssb_sgis-1.0.4}/src/sgis/__init__.py

@@ -2,6 +2,7 @@ config = {
     "n_jobs": 1,
 }
 
+
 import sgis.raster.indices as indices
 from sgis.raster.raster import Raster
 from sgis.raster.raster import get_shape_from_bounds
@@ -15,7 +16,6 @@ from .geopandas_tools.bounds import gridloop
 from .geopandas_tools.bounds import make_grid
 from .geopandas_tools.bounds import make_grid_from_bbox
 from .geopandas_tools.bounds import make_ssb_grid
-from .geopandas_tools.bounds import points_in_bounds
 from .geopandas_tools.buffer_dissolve_explode import buff
 from .geopandas_tools.buffer_dissolve_explode import buffdiss
 from .geopandas_tools.buffer_dissolve_explode import buffdissexp
@@ -26,9 +26,9 @@ from .geopandas_tools.buffer_dissolve_explode import dissexp
 from .geopandas_tools.buffer_dissolve_explode import dissexp_by_cluster
 from .geopandas_tools.centerlines import get_rough_centerlines
 from .geopandas_tools.cleaning import coverage_clean
-from .geopandas_tools.cleaning import remove_spikes
 from .geopandas_tools.cleaning import split_and_eliminate_by_longest
-from .geopandas_tools.cleaning import split_by_neighbors
+
+# from .geopandas_tools.cleaning import split_by_neighbors
 from .geopandas_tools.conversion import coordinate_array
 from .geopandas_tools.conversion import from_4326
 from .geopandas_tools.conversion import to_4326
@@ -44,6 +44,8 @@ from .geopandas_tools.general import clean_geoms
 from .geopandas_tools.general import drop_inactive_geometry_columns
 from .geopandas_tools.general import get_common_crs
 from .geopandas_tools.general import get_grouped_centroids
+from .geopandas_tools.general import get_line_segments
+from .geopandas_tools.general import points_in_bounds
 from .geopandas_tools.general import random_points
 from .geopandas_tools.general import random_points_in_polygons
 from .geopandas_tools.general import sort_large_first
@@ -66,6 +68,7 @@ from .geopandas_tools.neighbors import sjoin_within_distance
 from .geopandas_tools.overlay import clean_overlay
 from .geopandas_tools.point_operations import snap_all
 from .geopandas_tools.point_operations import snap_within_distance
+from .geopandas_tools.polygon_operations import clean_dissexp
 from .geopandas_tools.polygon_operations import close_all_holes
 from .geopandas_tools.polygon_operations import close_small_holes
 from .geopandas_tools.polygon_operations import close_thin_holes
@@ -76,6 +79,7 @@ from .geopandas_tools.polygon_operations import get_cluster_mapper
 from .geopandas_tools.polygon_operations import get_gaps
 from .geopandas_tools.polygon_operations import get_holes
 from .geopandas_tools.polygon_operations import get_polygon_clusters
+from .geopandas_tools.polygon_operations import split_polygons_by_lines
 from .geopandas_tools.polygons_as_rings import PolygonsAsRings
 from .geopandas_tools.sfilter import sfilter
 from .geopandas_tools.sfilter import sfilter_inverse
@@ -115,15 +119,22 @@ from .networkanalysis.traveling_salesman import traveling_salesman_problem
 from .parallel.parallel import Parallel
 from .parallel.parallel import parallel_overlay
 from .raster.cube import DataCube
-
-try:
-    import sgis.raster.torchgeo as torchgeo
-except ImportError:
-    pass
-
+from .raster.cube import concat_cubes
+from .raster.image_collection import Band
+from .raster.image_collection import Image
+from .raster.image_collection import ImageCollection
+from .raster.image_collection import NDVIBand
+from .raster.image_collection import Sentinel2Band
+from .raster.image_collection import Sentinel2CloudlessBand
+from .raster.image_collection import Sentinel2CloudlessCollection
+from .raster.image_collection import Sentinel2CloudlessImage
+from .raster.image_collection import Sentinel2Collection
+from .raster.image_collection import Sentinel2Image
+from .raster.image_collection import concat_image_collections
 
 try:
     from .io.dapla_functions import check_files
+    from .io.dapla_functions import get_bounds_series
     from .io.dapla_functions import read_geopandas
     from .io.dapla_functions import write_geopandas
 except ImportError:

ssb_sgis-1.0.4/src/sgis/debug_config.py

@@ -0,0 +1,24 @@
+from typing import Any
+
+
+class _NoExplore:
+    """Simply so signal that explore functions should be immediately exited."""
+
+
+_DEBUG_CONFIG = {
+    # "center": (5.3719398, 59.00999914, 0.01),
+    # "center": (5.27306727, 59.44232754, 200),
+    # "center": (5.85575588, 62.33991158, 200),
+    # "center": (26.02870514, 70.68108478, 200),
+    "center": _NoExplore(),
+    "print": False,
+}
+
+
+def _try_debug_print(*args: Any) -> None:
+    if not _DEBUG_CONFIG["print"]:
+        return
+    try:
+        print(*args)
+    except Exception:
+        pass

{ssb_sgis-1.0.2 → ssb_sgis-1.0.4}/src/sgis/exceptions.py

@@ -1,7 +1,7 @@
 """Some small exception classes."""
 
 
-class NoPointsWithinSearchToleranceError(Exception):
+class NoPointsWithinSearchToleranceError(ValueError):
     """Exception for when the points are too far away from the network."""
 
     def __init__(
@@ -19,5 +19,5 @@ class NoPointsWithinSearchToleranceError(Exception):
         )
 
 
-class ZeroLinesError(Exception):
+class ZeroLinesError(ValueError):
     """DataFrame has 0 rows."""

{ssb_sgis-1.0.2 → ssb_sgis-1.0.4}/src/sgis/geopandas_tools/bounds.py

@@ -18,7 +18,7 @@ from ..parallel.parallel import Parallel
 from .conversion import to_bbox
 from .conversion import to_gdf
 from .general import clean_clip
-from .general import is_bbox_like
+from .general import get_common_crs
 
 
 @dataclass
@@ -37,7 +37,7 @@ class Gridlooper:
             Defaults to True.
 
     Examples:
-    --------
+    ---------
     Get some points and some polygons.
 
     >>> import sgis as sg
@@ -133,11 +133,7 @@ class Gridlooper:
             )
             results = self.parallelizer.map(func_with_clip, buffered_grid)
             if not self.gridbuffer or not self.clip:
-                return (
-                    results
-                    if not self.concat
-                    else pd.concat(results, ignore_index=True)
-                )
+                return self._return(results, args, kwargs)
             out = []
             for cell_res, unbuffered in zip(results, grid, strict=True):
                 out.append(
@@ -145,7 +141,7 @@ class Gridlooper:
                         cell_res, unbuffered, self.keep_geom_type
                     )
                 )
-            return out if not self.concat else pd.concat(out, ignore_index=True)
+            return self._return(out, args, kwargs)
 
         results = []
         for i, (unbuffered, buffered) in enumerate(
@@ -175,7 +171,18 @@ class Gridlooper:
             if self.verbose:
                 print(f"Done with {i+1} of {n} grid cells", end="\r")
 
-        return results if not self.concat else pd.concat(results, ignore_index=True)
+        return self._return(results, args, kwargs)
+
+    def _return(
+        self, results: list[Any], args: tuple[Any], kwargs: dict[str, Any]
+    ) -> list[Any] | GeoDataFrame:
+        if self.concat and len(results):
+            return pd.concat(results, ignore_index=True)
+        elif self.concat:
+            crs = get_common_crs(list(args) + list(kwargs.values()))
+            return GeoDataFrame({"geometry": []}, crs=crs)
+        else:
+            return results
 
 
 def gridloop(
@@ -222,7 +229,7 @@ def gridloop(
         TypeError: If args or kwargs has a wrong type
 
     Examples:
-    --------
+    ---------
     Get some points and some polygons.
 
     >>> import sgis as sg
@@ -442,7 +449,7 @@ def make_grid(
     obj: GeoDataFrame | GeoSeries | Geometry | tuple,
     gridsize: int | float,
     *,
-    crs: CRS = None,
+    crs: CRS | None = None,
     clip_to_bounds: bool = False,
 ) -> GeoDataFrame:
     """Create a polygon grid around geometries.
@@ -467,10 +474,6 @@ def make_grid(
     """
     if isinstance(obj, (GeoDataFrame | GeoSeries)):
         crs = obj.crs or crs
-    elif not crs:
-        raise ValueError(
-            "'crs' cannot be None when 'obj' is not GeoDataFrame/GeoSeries."
-        )
     if hasattr(obj, "__len__") and not len(obj):
         return GeoDataFrame({"geometry": []}, crs=crs)
 
@@ -617,7 +620,7 @@ def bounds_to_polygon(
         GeoDataFrame of box polygons with length and index of 'gdf'.
 
     Examples:
-    --------
+    ---------
     >>> import sgis as sg
     >>> gdf = sg.to_gdf([MultiPoint([(0, 0), (1, 1)]), Point(0, 0)])
     >>> gdf
@@ -652,8 +655,9 @@ def bounds_to_points(
         GeoDataFrame of multipoints with same length and index as 'gdf'.
 
     Examples:
-    --------
+    ---------
     >>> import sgis as sg
+    >>> from shapely.geometry import MultiPoint, Point
     >>> gdf = sg.to_gdf([MultiPoint([(0, 0), (1, 1)]), Point(0, 0)])
     >>> gdf
                                             geometry
@@ -680,24 +684,17 @@ def get_total_bounds(
     for obj in geometries:
         try:
             minx, miny, maxx, maxy = to_bbox(obj)
+            xs += [minx, maxx]
+            ys += [miny, maxy]
         except Exception as e:
-            if strict:
-                raise e
-            else:
-                continue
-        xs += [minx, maxx]
-        ys += [miny, maxy]
+            try:
+                for x in obj:
+                    minx, miny, maxx, maxy = to_bbox(x)
+                    xs += [minx, maxx]
+                    ys += [miny, maxy]
+            except Exception as e2:
+                if strict:
+                    raise e2 from e
+                else:
+                    continue
     return min(xs), min(ys), max(xs), max(ys)
-
-
-def points_in_bounds(gdf: GeoDataFrame | GeoSeries, n2: int) -> GeoDataFrame:
-    """Get a GeoDataFrame of points within the bounds of the GeoDataFrame."""
-    if not isinstance(gdf, (GeoDataFrame | GeoSeries)) and is_bbox_like(gdf):
-        minx, miny, maxx, maxy = gdf
-    else:
-        minx, miny, maxx, maxy = gdf.total_bounds
-    xs = np.linspace(minx, maxx, num=n2)
-    ys = np.linspace(miny, maxy, num=n2)
-    x_coords, y_coords = np.meshgrid(xs, ys, indexing="ij")
-    coords = np.concatenate((x_coords.reshape(-1, 1), y_coords.reshape(-1, 1)), axis=1)
-    return to_gdf(coords, crs=gdf.crs)