ssb-sgis 1.2.17__tar.gz → 1.3.1__tar.gz

{ssb_sgis-1.2.17 → ssb_sgis-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.2.17
+Version: 1.3.1
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.2.17 → ssb_sgis-1.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.17"
+version = "1.3.1"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"

{ssb_sgis-1.2.17 → ssb_sgis-1.3.1}/src/sgis/geopandas_tools/general.py

@@ -21,6 +21,7 @@ from shapely import get_coordinates
 from shapely import get_parts
 from shapely import linestrings
 from shapely import make_valid
+from shapely.errors import GEOSException
 from shapely.geometry import LineString
 from shapely.geometry import MultiPoint
 from shapely.geometry import Point
@@ -211,7 +212,10 @@ def clean_geoms(
     if isinstance(gdf, GeoDataFrame):
         # only repair if necessary
         if not gdf.geometry.is_valid.all():
-            gdf.geometry = gdf.make_valid()
+            try:
+                gdf.geometry = gdf.make_valid()
+            except GEOSException as e:
+                raise type(e)(f"{e}: {gdf.geometry}") from e
 
         notna = gdf.geometry.notna()
         if not notna.all():

{ssb_sgis-1.2.17 → ssb_sgis-1.3.1}/src/sgis/io/dapla_functions.py

@@ -464,7 +464,7 @@ def write_geopandas(
         )
 
     if not len(df) and get_child_paths(gcs_path, file_system):
-        # no need to write empty df for partitioned parquet
+        # no need to write empty df for partitioned parquet - if root dir exists
         return
     elif not len(df):
         if pandas_fallback:
@@ -586,9 +586,6 @@ def _write_partitioned_geoparquet(
 ):
     file_system = _get_file_system(file_system, kwargs)
 
-    if basename_template is None:
-        basename_template = uuid.uuid4().hex + "-{i}.parquet"
-
     if isinstance(partition_cols, str):
         partition_cols = [partition_cols]
 
@@ -623,7 +620,10 @@ def _write_partitioned_geoparquet(
         dfs.append(rows)
 
     def threaded_write(rows: DataFrame, path: str) -> None:
-        this_basename = basename_template.replace("-{i}", "0")
+        if basename_template is None:
+            this_basename = (uuid.uuid4().hex + "-{i}.parquet").replace("-{i}", "0")
+        else:
+            this_basename = basename_template.replace("-{i}", "0")
         for i, sibling_path in enumerate(sorted(glob_func(str(Path(path) / "**")))):
             if paths_are_equal(sibling_path, path):
                 continue