ssb-sgis 1.0.8__py3-none-any.whl → 1.0.9__py3-none-any.whl

sgis/raster/regex.py

@@ -74,7 +74,7 @@ def _extract_regex_match_from_string(
                 return re.search(regex, xml_file).group(1)
             except (TypeError, AttributeError, IndexError):
                 continue
-        raise _RegexError()
+        raise _RegexError(regexes)
 
     out = {}
     for regex in regexes:
@@ -84,7 +84,7 @@ def _extract_regex_match_from_string(
         except (TypeError, AttributeError):
             continue
     if not out:
-        raise _RegexError()
+        raise _RegexError(regexes)
     return out
 
 

sgis/raster/zonal.py

@@ -5,7 +5,6 @@ import geopandas as gpd
 import numpy as np
 import pandas as pd
 from shapely import Geometry
-from shapely.geometry import Polygon
 
 from ..helpers import get_non_numpy_func_name
 from ..helpers import get_numpy_func
@@ -28,46 +27,10 @@ def _prepare_zonal(
 
 
 def _make_geometry_iterrows(gdf: gpd.GeoDataFrame) -> list[tuple[int, Geometry]]:
-    """Because pandas iterrows returns non-geo Series."""
+    """Because pandas iterrows returns Series, not GeoSeries."""
     return list(gdf.geometry.items())
 
 
-def _zonal_func(
-    poly_iter: tuple[int, Polygon],
-    cube,
-    array_func: Callable,
-    aggfunc: str | Callable | Sequence[Callable | str],
-    func_names: list[str],
-    by_date: bool,
-) -> pd.DataFrame:
-    cube = cube.copy()
-    i, polygon = poly_iter
-    if not by_date or cube.date.isna().all():
-        df = _clip_and_aggregate(
-            cube, polygon, array_func, aggfunc, func_names, date=None, i=i
-        )
-        return df if by_date else df.drop(columns="date")
-
-    out = []
-
-    na_date = cube[cube.date.isna()]
-    df = _clip_and_aggregate(
-        na_date, polygon, array_func, aggfunc, func_names, date=pd.NA, i=i
-    )
-    out.append(df)
-
-    cube = cube[lambda x: x["date"].notna()]
-
-    for dt in cube.date.unique():
-        cube_date = cube[cube.date == dt]
-        df = _clip_and_aggregate(
-            cube_date, polygon, array_func, aggfunc, func_names, dt, i
-        )
-        out.append(df)
-
-    return pd.concat(out)
-
-
 def _no_overlap_df(func_names: list[str], i: int, date: str) -> pd.DataFrame:
     df = pd.DataFrame(columns=func_names, index=[i])
     df["date"] = date
@@ -75,26 +38,6 @@ def _no_overlap_df(func_names: list[str], i: int, date: str) -> pd.DataFrame:
     return df
 
 
-def _clip_and_aggregate(
-    cube,
-    polygon: Geometry,
-    array_func: Callable,
-    aggfunc: Callable,
-    func_names: list[str],
-    date: str,
-    i: int,
-) -> pd.DataFrame:
-    if not len(cube):
-        return _no_overlap_df(func_names, i, date)
-    clipped = cube.clipmerge(polygon)
-    if not len(clipped) or [arr is None for arr in clipped.arrays]:
-        return _no_overlap_df(func_names, i, date)
-    assert len(clipped) == 1
-    array = clipped[0].array
-    df = _aggregate(array, array_func, aggfunc, func_names, date, i)
-    return df
-
-
 def _aggregate(
     array: np.ndarray,
     array_func: Callable,

{ssb_sgis-1.0.8.dist-info → ssb_sgis-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.0.8
+Version: 1.0.9
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
@@ -34,7 +34,6 @@ 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: numba (>=0.60.0)
 Requires-Dist: numpy (>=1.26.4)
 Requires-Dist: pandas (>=2.2.1)
 Requires-Dist: pyarrow (>=11.0.0)

{ssb_sgis-1.0.8.dist-info → ssb_sgis-1.0.9.dist-info}/RECORD

@@ -6,7 +6,7 @@ sgis/geopandas_tools/bounds.py,sha256=iIIqacQafn4XrWDaJtaffLrW72z3ce_-YYwdTtWmA8
 sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=5Dy-HfLm-n4IjlLm98Wtufl4IuCw0Zglyy5VlEH0mak,19955
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
 sgis/geopandas_tools/cleaning.py,sha256=I3tpn5uzsLjRYi-TybUe3QuNns0CseuxkfBSmSMer0I,60208
-sgis/geopandas_tools/conversion.py,sha256=Cl_8tYvR0eRi26CPK2ZnIorYXJZ2vkNiDqe0VzSDVaE,25461
+sgis/geopandas_tools/conversion.py,sha256=o3QJZLfaqqpJNdWWNKfQn_dS77uJxxRxWZxhf18vPXs,25505
 sgis/geopandas_tools/duplicates.py,sha256=LG8-BG8LdA2zjWauuloslIZHvMGND6Fja0MtXIPZ1wo,14301
 sgis/geopandas_tools/general.py,sha256=_XpQf792JqkvnMvEqtUMkPGVhjsct2SHSAyDYFdCyuQ,39885
 sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
@@ -19,17 +19,17 @@ sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJ
 sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhmeZY,9345
 sgis/helpers.py,sha256=3NqPfVBKlZcZTiMJrsTAlDv5tNKDHrJr_8NimutVzQg,8797
 sgis/io/_is_dapla.py,sha256=o_qFD5GOi3dsSGOKmW6R8wZU0htVwFgRbGX7ppJCqT4,431
-sgis/io/dapla_functions.py,sha256=8dfxBtkGUy7vltlKydXkathBsSd9DPHVIDIOe-Ctjsg,18180
-sgis/io/opener.py,sha256=BHyH7L8Ubh9C4Lsb8eBzGI6FLWg8UQFu-1bg3NEy_2k,862
+sgis/io/dapla_functions.py,sha256=e4EYjZK2Sxt5OwxI6a8y-ye7EpjLJFbG80qAZWcfsiE,18216
+sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/maps/examine.py,sha256=Pb0dH8JazU5E2svfQrzHO1Bi-sjy5SeyY6zoeMO34jE,9369
-sgis/maps/explore.py,sha256=mbSKFynLklJ3g4YfZJMDUo4K7Lg3sDoXDtnJ0l4L51w,45533
+sgis/maps/explore.py,sha256=vVwqdhb-vXvmeIPvBqizVhWMmI4ICXjWsEuiuElIPCA,45864
 sgis/maps/httpserver.py,sha256=7Od9JMCtntcIQKk_TchetojMHzFHT9sPw7GANahI97c,1982
-sgis/maps/legend.py,sha256=1ZOhzftq1HRKlHphhfqUm82U-Kjx_xkACieLRevxke8,26232
-sgis/maps/map.py,sha256=4znVxefW2wVe_LSmGAVcJQxf3oF_6aAyppNo4EyYJH4,29431
+sgis/maps/legend.py,sha256=lVRVCkhPmJRjGK23obFJZAO3qp6du1LYnobkkN7DPkc,26279
+sgis/maps/map.py,sha256=smaf9i53EoRZWmZjn9UuqlhzUvVs1XKo2ItIpHxyuik,29592
 sgis/maps/maps.py,sha256=HbKG1OHkSFYZ2dpgpag6H-LY1tOtZKaZncNNrBQpkU4,23127
-sgis/maps/thematicmap.py,sha256=bFlZy2xSKmEOHhvM0d1pv8O9JuNjR3P_9colTJnduvE,20729
+sgis/maps/thematicmap.py,sha256=yAE1xEfubJcDmBlOJf-Q3SVae1ZHIEMP-YB95Wy8cRw,21691
 sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=9I3t9pnccUPr4mozy3TJCOpGCCf3UOIojmsbifubZbA,6368
@@ -48,13 +48,13 @@ sgis/networkanalysis/traveling_salesman.py,sha256=Jjo6bHY4KJ-eK0LycyTy0sWxZjgITs
 sgis/parallel/parallel.py,sha256=SlC_mOwvSSyWTKUcxLMGkuWHUkEC6dXTlN0Jn5cAtxA,39687
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sgis/raster/base.py,sha256=Bdd30DS0iIv7fo93vrFoEBGC7a5PFaBXT46fcHwgORY,6558
-sgis/raster/image_collection.py,sha256=XrQddJgpP-R0KeLEWeqsOBOaMExA9lCt0_5rR7tXku8,118307
+sgis/raster/base.py,sha256=tiZEuMcVK6hOm_aIjWhQ1WGshcjsxT1fFkuBSLFiMC0,7785
+sgis/raster/image_collection.py,sha256=a2qpaYcLugZ4X9noFb0Ssgd4rOZi6iSqihTNKx4xQsU,120124
 sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
-sgis/raster/regex.py,sha256=I7pTAYNoOFgcPRLllR4jGMhmRk8AkOgm1D38fDSFnlg,3745
+sgis/raster/regex.py,sha256=kYhVpRYzoXutx1dSYmqMoselWXww7MMEsTPmLZwHjbM,3759
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
-sgis/raster/zonal.py,sha256=st2mWiUcdxeEiHBOZSgFOnVcP6pc4EMPJBPw537Z4V8,3837
-ssb_sgis-1.0.8.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.0.8.dist-info/METADATA,sha256=9Q_QyG0VOQAy9uhAi1kX64dVgb6AJ2xWwG91B_r_Nxo,11772
-ssb_sgis-1.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.0.8.dist-info/RECORD,,
+sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
+ssb_sgis-1.0.9.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.0.9.dist-info/METADATA,sha256=mf5eTre1PC3C7F_NLCDXUx61cOULgxksy1O0DY3WOh4,11740
+ssb_sgis-1.0.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.0.9.dist-info/RECORD,,