ssb-sgis 1.3.0__tar.gz → 1.3.2__tar.gz

{ssb_sgis-1.3.0 → ssb_sgis-1.3.2}/PKG-INFO

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

{ssb_sgis-1.3.0 → ssb_sgis-1.3.2}/pyproject.toml

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

{ssb_sgis-1.3.0 → ssb_sgis-1.3.2}/src/sgis/geopandas_tools/bounds.py

@@ -479,8 +479,10 @@ def make_grid(
 
     minx, miny, maxx, maxy = to_bbox(obj)
 
-    minx = int(minx) if minx > 0 else int(minx - 1)
-    miny = int(miny) if miny > 0 else int(miny - 1)
+    if not isinstance(minx, int) and not float(minx).is_integer():
+        minx = int(minx) if minx > 0 else int(minx - 1)
+    if not isinstance(miny, int) and not float(miny).is_integer():
+        miny = int(miny) if miny > 0 else int(miny - 1)
 
     grid = make_grid_from_bbox(minx, miny, maxx, maxy, gridsize=gridsize, crs=crs)
 

{ssb_sgis-1.3.0 → ssb_sgis-1.3.2}/src/sgis/io/dapla_functions.py

@@ -393,7 +393,9 @@ def get_bounds_series(
         paths = [paths]
 
     threads = (
-        min(len(paths), int(multiprocessing.cpu_count())) or 1 if use_threads else 1
+        min(len(paths), int(multiprocessing.cpu_count() * 1.2)) or 1
+        if use_threads
+        else 1
     )
 
     with joblib.Parallel(n_jobs=threads, backend="threading") as parallel:
@@ -623,7 +625,7 @@ def _write_partitioned_geoparquet(
         if basename_template is None:
             this_basename = (uuid.uuid4().hex + "-{i}.parquet").replace("-{i}", "0")
         else:
-            this_basename = basename_template
+            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