ssb-sgis 1.2.14__tar.gz → 1.2.15__tar.gz

{ssb_sgis-1.2.14 → ssb_sgis-1.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.2.14
+Version: 1.2.15
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
@@ -182,9 +182,13 @@ weights["weight"] = 10
 frequencies = nwa.get_route_frequencies(origins, destinations, weight_df=weights)
 
 # plot the results
-m = sg.ThematicMap(sg.buff(frequencies, 15), column="frequency", black=True)
-m.cmap = "plasma"
-m.title = "Number of times each road was used,\nweighted * 10"
+m = sg.ThematicMap(
+    sg.buff(frequencies, 15),
+    column="frequency",
+    black=True,
+    cmap="plasma",
+    title="Number of times each road was used,\nweighted * 10",
+)
 m.plot()
 ```
 
@@ -199,9 +203,14 @@ service_areas = nwa.service_area(
 )
 
 # plot the results
-m = sg.ThematicMap(service_areas, column="minutes", black=True, size=10)
-m.k = 10
-m.title = "Roads that can be reached within 1 to 10 minutes"
+m = sg.ThematicMap(
+    service_areas,
+    column="minutes",
+    black=True,
+    size=10,
+    k=10,
+    title="Roads that can be reached within 1 to 10 minutes",
+)
 m.plot()
 ```
 
@@ -214,9 +223,15 @@ routes = nwa.get_k_routes(
     points.iloc[[0]], points.iloc[[1]], k=4, drop_middle_percent=50
 )
 
-m = sg.ThematicMap(sg.buff(routes, 15), column="k", black=True)
-m.title = "Four fastest routes from A to B"
-m.legend.title = "Rank"
+m = sg.ThematicMap(
+    sg.buff(routes, 15),
+    column="k",
+    black=True,
+    title="Four fastest routes from A to B",
+    legend_kwargs=dict(
+        title="Rank",
+    ),
+)
 m.plot()
 ```
 

{ssb_sgis-1.2.14 → ssb_sgis-1.2.15}/README.md

@@ -126,9 +126,13 @@ weights["weight"] = 10
 frequencies = nwa.get_route_frequencies(origins, destinations, weight_df=weights)
 
 # plot the results
-m = sg.ThematicMap(sg.buff(frequencies, 15), column="frequency", black=True)
-m.cmap = "plasma"
-m.title = "Number of times each road was used,\nweighted * 10"
+m = sg.ThematicMap(
+    sg.buff(frequencies, 15),
+    column="frequency",
+    black=True,
+    cmap="plasma",
+    title="Number of times each road was used,\nweighted * 10",
+)
 m.plot()
 ```
 
@@ -143,9 +147,14 @@ service_areas = nwa.service_area(
 )
 
 # plot the results
-m = sg.ThematicMap(service_areas, column="minutes", black=True, size=10)
-m.k = 10
-m.title = "Roads that can be reached within 1 to 10 minutes"
+m = sg.ThematicMap(
+    service_areas,
+    column="minutes",
+    black=True,
+    size=10,
+    k=10,
+    title="Roads that can be reached within 1 to 10 minutes",
+)
 m.plot()
 ```
 
@@ -158,9 +167,15 @@ routes = nwa.get_k_routes(
     points.iloc[[0]], points.iloc[[1]], k=4, drop_middle_percent=50
 )
 
-m = sg.ThematicMap(sg.buff(routes, 15), column="k", black=True)
-m.title = "Four fastest routes from A to B"
-m.legend.title = "Rank"
+m = sg.ThematicMap(
+    sg.buff(routes, 15),
+    column="k",
+    black=True,
+    title="Four fastest routes from A to B",
+    legend_kwargs=dict(
+        title="Rank",
+    ),
+)
 m.plot()
 ```
 

{ssb_sgis-1.2.14 → ssb_sgis-1.2.15}/pyproject.toml

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

{ssb_sgis-1.2.14 → ssb_sgis-1.2.15}/src/sgis/io/dapla_functions.py

@@ -92,7 +92,11 @@ def read_geopandas(
     if isinstance(gcs_path, (Path | os.PathLike)):
         gcs_path = str(gcs_path)
 
-    if not isinstance(gcs_path, (str | Path | os.PathLike)):
+    if isinstance(gcs_path, str):
+        gcs_path = _maybe_strip_prefix(gcs_path, file_system)
+    else:
+        gcs_path = [_maybe_strip_prefix(str(path), file_system) for path in gcs_path]
+
         return _read_geopandas_from_iterable(
             gcs_path,
             mask=mask,
@@ -925,3 +929,9 @@ def _get_files_in_subfolders(folderinfo: list[dict]) -> list[tuple]:
         folderinfo = new_folderinfo
 
     return fileinfo
+
+
+def _maybe_strip_prefix(path, file_system):
+    if isinstance(file_system, GCSFileSystem) and path.startswith("gs://"):
+        return path.replace("gs://", "")
+    return path

{ssb_sgis-1.2.14 → ssb_sgis-1.2.15}/src/sgis/maps/legend.py

@@ -523,7 +523,7 @@ class ContinousLegend(Legend):
     def __init__(
         self,
         labels: list[str] | None = None,
-        pretty_labels: bool = True,
+        pretty_labels: bool = False,
         label_suffix: str | None = None,
         label_sep: str = "-",
         rounding: int | None = None,