ssb-sgis 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

sgis/__init__.py

@@ -4,9 +4,6 @@ config = {
 
 
 import sgis.raster.indices as indices
-from sgis.raster.raster import Raster
-from sgis.raster.raster import get_shape_from_bounds
-from sgis.raster.raster import get_transform_from_bounds
 
 from .geopandas_tools.bounds import Gridlooper
 from .geopandas_tools.bounds import bounds_to_points
@@ -45,6 +42,7 @@ 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 make_lines_between_points
 from .geopandas_tools.general import points_in_bounds
 from .geopandas_tools.general import random_points
 from .geopandas_tools.general import random_points_in_polygons
@@ -52,6 +50,7 @@ from .geopandas_tools.general import sort_large_first
 from .geopandas_tools.general import sort_long_first
 from .geopandas_tools.general import sort_short_first
 from .geopandas_tools.general import sort_small_first
+from .geopandas_tools.general import split_out_circles
 from .geopandas_tools.general import to_lines
 from .geopandas_tools.geocoding import address_to_coords
 from .geopandas_tools.geocoding import address_to_gdf
@@ -102,6 +101,7 @@ from .maps.tilesources import kartverket as kartverket_tiles
 from .maps.tilesources import xyz as xyztiles
 from .networkanalysis.closing_network_holes import close_network_holes
 from .networkanalysis.closing_network_holes import close_network_holes_to_deadends
+from .networkanalysis.closing_network_holes import get_k_nearest_points_for_deadends
 from .networkanalysis.cutting_lines import cut_lines
 from .networkanalysis.cutting_lines import cut_lines_once
 from .networkanalysis.cutting_lines import split_lines_by_nearest_point
@@ -118,8 +118,8 @@ from .networkanalysis.nodes import make_node_ids
 from .networkanalysis.traveling_salesman import traveling_salesman_problem
 from .parallel.parallel import Parallel
 from .parallel.parallel import parallel_overlay
-from .raster.cube import DataCube
-from .raster.cube import concat_cubes
+from .parallel.parallel import parallel_overlay_rowwise
+from .parallel.parallel import parallel_sjoin
 from .raster.image_collection import Band
 from .raster.image_collection import Image
 from .raster.image_collection import ImageCollection

sgis/debug_config.py

@@ -9,6 +9,7 @@ _DEBUG_CONFIG = {
     # "center": (5.3719398, 59.00999914, 0.01),
     # "center": (5.27306727, 59.44232754, 200),
     # "center": (5.85575588, 62.33991158, 200),
+    # "center": (12.11270809, 66.55499008, 10),
     # "center": (26.02870514, 70.68108478, 200),
     "center": _NoExplore(),
     "print": False,

sgis/geopandas_tools/buffer_dissolve_explode.py

@@ -24,7 +24,6 @@ from geopandas import GeoSeries
 from shapely import get_num_geometries
 
 from ..parallel.parallel import Parallel
-from .general import _grouped_unary_union
 from .general import _parallel_unary_union
 from .general import _unary_union_for_notna
 from .geometry_types import make_all_singlepart
@@ -252,8 +251,6 @@ def _dissolve(
         aggfunc
     )
 
-    # dissolved = gdf.groupby(by, **dissolve_kwargs)[other_cols].agg(aggfunc)
-
     if n_jobs > 1:
         try:
             agged = _parallel_unary_union(
@@ -270,48 +267,14 @@ def _dissolve(
             print(e, dissolved, agged, many_hits)
             raise e
 
-    # geoms_agged = many_hits.groupby(by, **dissolve_kwargs)[geom_col].agg(
-    #     lambda x: _unary_union_for_notna(x, grid_size=grid_size)
-    # )
-    # print("\n\n\ngeomsagged\n", geoms_agged, geoms_agged.shape)
-    geoms_agged = _grouped_unary_union(many_hits, by, as_index=True, **dissolve_kwargs)
-    # print(geoms_agged, geoms_agged.shape)
-
-    # if not as_index:
-    #     try:
-    #         geoms_agged = geoms_agged[geom_col]
-    #     except KeyError:
-    #         pass
+    geoms_agged = many_hits.groupby(by, **dissolve_kwargs)[geom_col].agg(
+        lambda x: _unary_union_for_notna(x, grid_size=grid_size)
+    )
 
     dissolved[geom_col] = geoms_agged
 
     if not as_index:
         dissolved = dissolved.reset_index()
-    # else:
-    #     one_hit = one_hit.set
-    # dissolved = dissolved.reset_index()
-
-    # from ..maps.maps import explore, explore_locals
-    # from .conversion import to_gdf
-
-    # try:
-    #     explore(
-    #         dissolved=to_gdf(dissolved, 25833),
-    #         geoms_agged=to_gdf(geoms_agged, 25833),
-    #         gdf=gdf,
-    #         column="ARTYPE",
-    #     )
-    # except Exception:
-    #     explore(
-    #         dissolved=to_gdf(dissolved, 25833),
-    #         geoms_agged=to_gdf(geoms_agged, 25833),
-    #         gdf=gdf,
-    #     )
-
-    # from ..maps.maps import explore_locals
-    # from .conversion import to_gdf
-
-    # explore_locals()
 
     try:
         return GeoDataFrame(

sgis/geopandas_tools/conversion.py

@@ -12,9 +12,7 @@ import geopandas as gpd
 import numpy as np
 import pandas as pd
 import pyproj
-import rasterio
 import shapely
-from affine import Affine
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
 from numpy.typing import NDArray
@@ -22,7 +20,6 @@ from pandas.api.types import is_array_like
 from pandas.api.types import is_dict_like
 from pandas.api.types import is_list_like
 from pyproj import CRS
-from rasterio import features
 from shapely import Geometry
 from shapely import box
 from shapely import wkb
@@ -32,6 +29,20 @@ from shapely.geometry import Point
 from shapely.geometry import shape
 from shapely.ops import unary_union
 
+try:
+    import rasterio
+    from rasterio import features
+except ImportError:
+    pass
+
+try:
+    from affine import Affine
+except ImportError:
+
+    class Affine:
+        """Placeholder."""
+
+
 try:
     from torchgeo.datasets.geo import RasterDataset
 except ImportError:
@@ -275,11 +286,12 @@ def to_gdf(
 ) -> GeoDataFrame:
     """Converts geometry-like objects to a GeoDataFrame.
 
-    Constructs a GeoDataFrame from any geometry-like object (coordinates, wkt, wkb),
-    or any interable of such objects.
+    Constructs a GeoDataFrame from any geometry-like object
+    (coordinates, wkt, wkb, dict, string) or any interable of such objects.
 
-    Meant for convenience in testing and exploring, not for production code since it
-    introduces unnecessary overhead.
+    NOTE: The function is meant for convenience in testing and exploring,
+    not for production code since it introduces unnecessary overhead
+    and potential errors.
 
     If obj is a DataFrame or dictionary, geometries can be in one column/key or 2-3
     if coordiantes are in x and x (and z) columns. The column/key "geometry" is used
@@ -462,9 +474,25 @@ def to_gdf(
             if index is not None:
                 obj.index = index
             return GeoDataFrame({geom_col: obj}, geometry=geom_col, crs=crs, **kwargs)
-        # list etc.
         else:
-            obj = GeoSeries(_make_shapely_geoms(obj), index=index)
+            if isinstance(obj, str):
+                if (
+                    obj.replace(" ", "")
+                    .replace(",", "")
+                    .replace(".", "")
+                    .replace("(", "")
+                    .replace(")", "")
+                    .isnumeric()
+                ):
+                    # string of coordinates
+                    obj = eval(obj)
+                    obj = GeoSeries([_make_one_shapely_geom(obj)], index=index)
+                else:
+                    # wkt
+                    obj = GeoSeries([_make_one_shapely_geom(obj)], index=index)
+            else:
+                # list etc.
+                obj = GeoSeries(_make_shapely_geoms(obj), index=index)
             return GeoDataFrame(
                 {geom_col: obj}, geometry=geom_col, index=index, crs=crs, **kwargs
             )