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

sgis/geopandas_tools/geometry_types.py

@@ -64,7 +64,7 @@ def to_single_geom_type(
         ValueError: If 'geom_type' is neither 'polygon', 'line' or 'point'.
 
     Examples:
-    --------
+    ---------
     First create a GeoDataFrame of mixed geometries.
 
     >>> from sgis import to_gdf, to_single_geom_type
@@ -138,7 +138,7 @@ def to_single_geom_type(
 
 def _shapely_to_single_geom_type(geom: Geometry, geom_type: str) -> Geometry:
     parts = shapely.get_parts(geom)
-    return shapely.unary_union(
+    return shapely.union_all(
         [part for part in parts if geom_type.lower() in part.geom_type.lower()]
     )
 
@@ -156,7 +156,7 @@ def get_geom_type(gdf: GeoDataFrame | GeoSeries) -> str:
         TypeError: If 'gdf' is not of type GeoDataFrame or GeoSeries.
 
     Examples:
-    --------
+    ---------
     >>> from sgis import to_gdf, get_geom_type
     >>> gdf = to_gdf([0, 0])
     >>> gdf
@@ -204,7 +204,7 @@ def is_single_geom_type(gdf: GeoDataFrame | GeoSeries) -> bool:
         TypeError: If 'gdf' is not of type GeoDataFrame or GeoSeries.
 
     Examples:
-    --------
+    ---------
     >>> from sgis import to_gdf, get_geom_type
     >>> gdf = to_gdf([0, 0])
     >>> gdf

sgis/geopandas_tools/neighbors.py

@@ -13,6 +13,7 @@ import shapely
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
 from pandas import DataFrame
+from pandas import MultiIndex
 from pandas import Series
 from sklearn.neighbors import NearestNeighbors
 
@@ -50,7 +51,7 @@ def get_neighbor_indices(
             system.
 
     Examples:
-    --------
+    ---------
     >>> from sgis import get_neighbor_indices, to_gdf
     >>> points = to_gdf([(0, 0), (0.5, 0.5)])
     >>> points
@@ -97,29 +98,32 @@ def get_neighbor_indices(
     ['a' 'a' 'b' 'b']
 
     """
+    if isinstance(gdf.index, MultiIndex) or isinstance(neighbors.index, MultiIndex):
+        raise ValueError("get_neighbor_indices not implemented for pandas.MultiIndex")
     if gdf.crs != neighbors.crs:
         raise ValueError(f"'crs' mismatch. Got {gdf.crs} and {neighbors.crs}")
 
     if isinstance(neighbors, GeoSeries):
         neighbors = neighbors.to_frame()
+    else:
+        neighbors = neighbors[[neighbors._geometry_column_name]]
 
     # buffer and keep only geometry column
     if max_distance and predicate != "nearest":
-        gdf = gdf.buffer(max_distance).to_frame()
+        gdf = gdf.buffer(max_distance).to_frame("geometry")
     else:
-        gdf = gdf.geometry.to_frame()
+        gdf = gdf.geometry.to_frame("geometry")
+
+    neighbors.index.name = None
+    gdf.index.name = None
 
     if predicate == "nearest":
         max_distance = None if max_distance == 0 else max_distance
-        joined = gdf.sjoin_nearest(
-            neighbors, how="inner", max_distance=max_distance
-        ).rename(columns={"index_right": "neighbor_index"}, errors="raise")
+        joined = gdf.sjoin_nearest(neighbors, how="inner", max_distance=max_distance)
     else:
-        joined = gdf.sjoin(neighbors, how="inner", predicate=predicate).rename(
-            columns={"index_right": "neighbor_index"}, errors="raise"
-        )
+        joined = gdf.sjoin(neighbors, how="inner", predicate=predicate)
 
-    return joined["neighbor_index"]
+    return joined.rename(columns={"index_right": "neighbor_index"})["neighbor_index"]
 
 
 def get_neighbor_dfs(
@@ -153,7 +157,7 @@ def get_all_distances(
             not the same.
 
     Examples:
-    --------
+    ---------
     >>> from sgis import get_all_distances, random_points
     >>> points = random_points(100)
     >>> neighbors = random_points(100)
@@ -297,7 +301,7 @@ def get_k_nearest_neighbors(
             not the same.
 
     Examples:
-    --------
+    ---------
     Make some random points.
 
     >>> from sgis import get_k_nearest_neighbors, random_points
@@ -469,6 +473,6 @@ def _get_edges(
     Returns:
       A 2d numpy array of edges (from-to indices).
     """
-    return np.array(
-        [[(i, neighbor) for neighbor in indices[i]] for i in range(len(gdf))]
-    )
+    row_indices = np.arange(len(indices)).reshape(-1, 1)
+
+    return np.stack((np.broadcast_to(row_indices, indices.shape), indices), axis=-1)

sgis/geopandas_tools/overlay.py

@@ -238,8 +238,8 @@ def _shapely_pd_overlay(
     left, right = tree.query(df1.geometry.values, predicate=predicate)
 
     pairs = _get_intersects_pairs(df1, df2, left, right, rsuffix)
-    assert pairs.geometry.notna().all()
-    assert pairs.geom_right.notna().all()
+    assert pairs.geometry.notna().all(), pairs.geometry
+    assert pairs.geom_right.notna().all(), pairs.geom_right
 
     if how == "intersection":
         overlayed = [

sgis/geopandas_tools/point_operations.py

@@ -5,7 +5,7 @@ import pandas as pd
 from geopandas import GeoDataFrame
 from geopandas import GeoSeries
 from shapely import distance
-from shapely import unary_union
+from shapely import union_all
 from shapely.ops import nearest_points
 
 from ..geopandas_tools.geometry_types import get_geom_type
@@ -48,7 +48,7 @@ def snap_within_distance(
         vertices.
 
     Examples:
-    --------
+    ---------
     Create som points.
 
     >>> from sgis import snap_within_distance, to_gdf
@@ -136,7 +136,7 @@ def snap_all(
         vertices.
 
     Examples:
-    --------
+    ---------
     Create som points.
 
     >>> from sgis import snap_all, to_gdf
@@ -201,9 +201,9 @@ def _shapely_snap(
     max_distance: int | float | None = None,
 ) -> GeoSeries:
     try:
-        unioned = to.unary_union
+        unioned = union_all(to.geometry.values)
     except AttributeError:
-        unioned = unary_union(to)
+        unioned = union_all(to)
 
     nearest = nearest_points(points, unioned)[1]