ssb-sgis 1.3.4__py3-none-any.whl → 1.3.5__py3-none-any.whl

sgis/parallel/parallel.py

@@ -21,6 +21,7 @@ import joblib
 import numpy as np
 import pandas as pd
 from geopandas import GeoDataFrame
+from geopandas import sjoin
 from pandas import DataFrame
 from pandas import Series
 
@@ -170,47 +171,18 @@ def parallel_sjoin(
     Returns:
         A GeoDataFrame containing the result of the overlay operation.
     """
+    df1 = df1.assign(_df1_range_idx=range(len(df1)))
+    df2 = df2.assign(_df2_range_idx=range(len(df2)), _from_df2=1)
     return pd.concat(
         chunkwise(
-            _sjoin_within_first,
+            sjoin,
             df1,
-            kwargs={
-                "df2": df2,
-                "to_print": to_print,
-            }
-            | kwargs,
+            kwargs={"right_df": df2, **kwargs},
             processes=processes,
             max_rows_per_chunk=max_rows_per_chunk,
             backend=backend,
         ),
-        ignore_index=True,
-    )
-
-
-def _sjoin_within_first(
-    df1, df2, to_print: str | None = None, predicate: str = "intersects", **kwargs
-):
-    if to_print:
-        print(to_print, "- sjoin chunk len:", len(df1))
-
-    df2 = df2.reset_index(drop=True)
-    df2["_from_df2"] = 1
-    df1["_range_idx"] = range(len(df1))
-    joined = df1.sjoin(df2, predicate="within", how="left")
-    within = joined.loc[joined["_from_df2"].notna()].drop(
-        columns=["_from_df2", "_range_idx", "index_right"], errors="raise"
-    )
-    not_within = df1.loc[
-        df1["_range_idx"].isin(joined.loc[joined["_from_df2"].isna(), "_range_idx"])
-    ]
-
-    return pd.concat(
-        [
-            within,
-            not_within.sjoin(df2, predicate=predicate, **kwargs),
-        ],
-        ignore_index=True,
-    )
+    ).drop(columns=["_df1_range_idx", "_df2_range_idx", "_from_df2"], errors="raise")
 
 
 def _clip_rowwise(df1, df2, to_print: str | None = None):

{ssb_sgis-1.3.4.dist-info → ssb_sgis-1.3.5.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.3.4
+Version: 1.3.5
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
 Author: Morten Letnes
 Author-email: morten.letnes@ssb.no
-Requires-Python: >=3.11
+Requires-Python: >=3.11,<4
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3

{ssb_sgis-1.3.4.dist-info → ssb_sgis-1.3.5.dist-info}/RECORD

@@ -52,7 +52,7 @@ sgis/networkanalysis/networkanalysisrules.py,sha256=na26iZTpnlwwIEEGswoqMH4W1ZOL
 sgis/networkanalysis/nodes.py,sha256=atFSpqz-_uJHMrf6MC0zhrrcWIydRMFZrsaHC2xr1GU,3374
 sgis/networkanalysis/traveling_salesman.py,sha256=Jjo6bHY4KJ-eK0LycyTy0sWxZjgITs5MBllZ_G9FhTE,5655
 sgis/parallel/__init__.py,sha256=fw_Fl3IJk1bKzrRBhZIoOpznJqwd09NVHJJFj2ZLeIU,32
-sgis/parallel/parallel.py,sha256=V7O5mEZdfJpcOPrmn2H4bEGtbzA0FggjQ8dGhznjr80,40052
+sgis/parallel/parallel.py,sha256=3Nq7cgvkVmg-2TEyNCEiqBshYOHt6Qf6xg6rrcnzf78,39394
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/base.py,sha256=8JdXXDj8CgJQt5WIkkNbpM5U0pYyQrWQY9dszfUaUQ4,7743
@@ -61,7 +61,7 @@ sgis/raster/indices.py,sha256=efJmgfPg_VuSzXFosXV661IendF8CwPFWtMhyP4TMUg,222
 sgis/raster/regex.py,sha256=4idTJ9vFtsGtbxcjJrx2VrpJJuDMP3bLdqF93Vc_cmY,3752
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.3.4.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.3.4.dist-info/METADATA,sha256=wAMZDLihfcah_G-Um-7ckwBhyWZy3LqUw6u9x6W2Bf4,11492
-ssb_sgis-1.3.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.3.4.dist-info/RECORD,,
+ssb_sgis-1.3.5.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.3.5.dist-info/METADATA,sha256=TbqucBYChWXB_Xw2eFf9PZwQoguEWeKGav18lFbhUfI,11495
+ssb_sgis-1.3.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.3.5.dist-info/RECORD,,