ssb-sgis 1.2.14__py3-none-any.whl → 1.2.16__py3-none-any.whl

sgis/geopandas_tools/conversion.py

@@ -507,7 +507,7 @@ def to_gdf(
             geoseries = GeoSeries(_make_shapely_geoms(obj.iloc[:, 0]), index=index)
         return GeoDataFrame({key: geoseries}, geometry=key, crs=crs, **kwargs)
 
-    if geometry and geom_col not in obj or isinstance(obj, pd.DataFrame):
+    if (geometry and geom_col not in obj) or isinstance(obj, pd.DataFrame):
         raise ValueError("Cannot find geometry column(s)", geometry)
 
     # geojson, __geo_interface__
@@ -595,10 +595,8 @@ def is_nested_geojson(obj: Any) -> bool:
 
 def get_crs_from_dict(obj: Any) -> CRS | None | Any:
     """Try to extract the 'crs' attribute of the object or an object in the object."""
-    if (
-        not hasattr(obj, "__iter__")
-        or not is_dict_like(obj)
-        and not is_dict_like(obj[0])
+    if not hasattr(obj, "__iter__") or (
+        not is_dict_like(obj) and not is_dict_like(obj[0])
     ):
         return None
 

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,10 @@ def _get_files_in_subfolders(folderinfo: list[dict]) -> list[tuple]:
         folderinfo = new_folderinfo
 
     return fileinfo
+
+
+def _maybe_strip_prefix(path, file_system):
+    """Strip gcs prefix only if file_system is GCS."""
+    if isinstance(file_system, GCSFileSystem) and path.startswith("gs://"):
+        return path.replace("gs://", "")
+    return path

sgis/maps/examine.py

@@ -121,10 +121,8 @@ class Examine:
             )
 
         if sort_values is not None:
-            if (
-                sort_values == "area"
-                or not isinstance(sort_values, str)
-                and "area" in sort_values
+            if sort_values == "area" or (
+                not isinstance(sort_values, str) and "area" in sort_values
             ):
                 self.mask_gdf["area"] = self.mask_gdf.area
             self.mask_gdf = self.mask_gdf.sort_values(sort_values)

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,

sgis/maps/map.py

@@ -543,8 +543,10 @@ class Map:
         def is_maybe_km2():
             if "area" in self._column and (
                 "km2" in self._column
-                or "kilomet" in self._column
-                and ("sq" in self._column or "2" in self._column)
+                or (
+                    "kilomet" in self._column
+                    and ("sq" in self._column or "2" in self._column)
+                )
             ):
                 return True
             else:

sgis/networkanalysis/networkanalysisrules.py

@@ -209,15 +209,15 @@ class NetworkAnalysisRules:
             return True
 
     def _validate_weight(self, gdf: GeoDataFrame) -> GeoDataFrame:
-        if "meter" in self.weight or "metre" in self.weight and unit_is_meters(gdf):
+        if "meter" in self.weight or ("metre" in self.weight and unit_is_meters(gdf)):
             if self.nodedist_kmh:
                 raise ValueError("Cannot set 'nodedist_kmh' when 'weight' is meters.")
             gdf[self.weight] = gdf.length
             return gdf
 
         # allow abbreviation of 'minutes' to be nice
-        elif (
-            self.weight == "min" or "minut" in self.weight and "minutes" in gdf.columns
+        elif self.weight == "min" or (
+            "minut" in self.weight and "minutes" in gdf.columns
         ):
             if self.nodedist_multiplier:
                 raise ValueError(

sgis/raster/image_collection.py

@@ -629,6 +629,8 @@ class _ImageBase:
         for key, value in self.__dict__.items():
             if key.startswith("_"):
                 continue
+            if key == "file_system" and type(value) is type(getattr(other, key)):
+                continue
             if value != getattr(other, key):
                 print(key, value, getattr(other, key))
                 return False
@@ -747,9 +749,8 @@ class _ImageBandBase(_ImageBase):
                         continue
                     if results is not None:
                         break
-                elif (
-                    isinstance(value, str)
-                    or hasattr(value, "__iter__")
+                elif isinstance(value, str) or (
+                    hasattr(value, "__iter__")
                     and all(isinstance(x, str | re.Pattern) for x in value)
                 ):
                     try:
@@ -1538,9 +1539,8 @@ class Image(_ImageBandBase):
         else:
             self._all_file_paths = None
 
-        if (
-            self.metadata is None
-            or not len(self.metadata)
+        if self.metadata is None or (
+            not len(self.metadata)
             and "metadata.json" in {Path(x).name for x in self._all_file_paths}
         ):
             with _open_func(
@@ -1845,7 +1845,8 @@ class Image(_ImageBandBase):
         if (
             self.filename_patterns
             and any(_get_non_optional_groups(pat) for pat in self.filename_patterns)
-            or self.image_patterns
+        ) or (
+            self.image_patterns
             and any(_get_non_optional_groups(pat) for pat in self.image_patterns)
         ):
             self._bands = [band for band in self._bands if band.band_id is not None]
@@ -1882,8 +1883,7 @@ class Image(_ImageBandBase):
                 for group in sort_groups
                 for pat in self.filename_patterns
             )
-            or all(band.band_id is not None for band in self)
-        )
+        ) or all(band.band_id is not None for band in self)
 
     @property
     def tile(self) -> str:
@@ -2846,17 +2846,21 @@ class ImageCollection(_ImageBase):
         """True if the ImageCollection has regexes that should make it sortable by date."""
         sort_group = "date"
         return (
-            self.filename_patterns
-            and any(
-                sort_group in pat.groupindex
-                and sort_group in _get_non_optional_groups(pat)
-                for pat in self.filename_patterns
+            (
+                self.filename_patterns
+                and any(
+                    sort_group in pat.groupindex
+                    and sort_group in _get_non_optional_groups(pat)
+                    for pat in self.filename_patterns
+                )
             )
-            or self.image_patterns
-            and any(
-                sort_group in pat.groupindex
-                and sort_group in _get_non_optional_groups(pat)
-                for pat in self.image_patterns
+            or (
+                self.image_patterns
+                and any(
+                    sort_group in pat.groupindex
+                    and sort_group in _get_non_optional_groups(pat)
+                    for pat in self.image_patterns
+                )
             )
             or all(getattr(img, sort_group) is not None for img in self)
         )

{ssb_sgis-1.2.14.dist-info → ssb_sgis-1.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.2.14
+Version: 1.2.16
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT
@@ -17,9 +17,9 @@ Classifier: Topic :: Scientific/Engineering :: GIS
 Provides-Extra: all
 Provides-Extra: bucket
 Provides-Extra: test
-Provides-Extra: torch
 Provides-Extra: xarray
 Requires-Dist: affine (>=2.4.0)
+Requires-Dist: black (>=25.1.0,<26.0.0)
 Requires-Dist: branca (>=0.6.0)
 Requires-Dist: dapla-toolbelt (>=3.0.1) ; extra == "all" or extra == "bucket"
 Requires-Dist: dask (>=2024.1.1) ; extra == "all" or extra == "test"
@@ -35,17 +35,16 @@ Requires-Dist: mapclassify (>=2.5.0)
 Requires-Dist: matplotlib (>=3.7.0)
 Requires-Dist: networkx (>=3.0)
 Requires-Dist: numpy (>=1.26.4)
-Requires-Dist: pandas (>=2.2.1)
+Requires-Dist: pandas (>=2.0.1)
 Requires-Dist: pyarrow (>=11.0.0)
 Requires-Dist: pyproj (>=3.6.1)
 Requires-Dist: rasterio (>=1.3.8)
 Requires-Dist: requests (>=2.28.2)
 Requires-Dist: rioxarray (>=0.15.5) ; extra == "all" or extra == "xarray" or extra == "test"
 Requires-Dist: rtree (>=1.0.1)
+Requires-Dist: ruff (>=0.12.8,<0.13.0)
 Requires-Dist: scikit-learn (>=1.2.1)
 Requires-Dist: shapely (>=2.0.1)
-Requires-Dist: torch (>=2.4.0) ; extra == "all" or extra == "torch" or extra == "test"
-Requires-Dist: torchgeo (>=0.5.2) ; extra == "all" or extra == "torch" or extra == "test"
 Requires-Dist: typing-extensions (>=4.11.0)
 Requires-Dist: xarray (>=2024.3.0) ; extra == "all" or extra == "xarray" or extra == "test"
 Requires-Dist: xyzservices (>=2023.2.0)
@@ -98,7 +97,7 @@ pip install ssb-sgis
 
 The sgis package has the following optional dependencies:
 
-- bucket: For working with files stored in GCP buckets
+- bucket: For working with files stored in GCS buckets
 - torch: Use functionality from PyTorch and torchgeo
 - xarray: Use functionality from xarray and rioxarray
 - test: Packages needed for running pytest
@@ -182,9 +181,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 +202,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 +222,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.dist-info → ssb_sgis-1.2.16.dist-info}/RECORD

@@ -7,7 +7,7 @@ sgis/geopandas_tools/bounds.py,sha256=PsA_rPEDIS0CopLtolWCB01UEdxc8gtsNbUqMd5AOL
 sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=z9HvakazR_prXH862e8-gEe7UFbeI4rRTbUaBgPeMBk,19552
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
 sgis/geopandas_tools/cleaning.py,sha256=fST0xFztmyn-QUOAfvjZmu7aO_zPiolWK7gd7TR6ffI,24393
-sgis/geopandas_tools/conversion.py,sha256=CrasgWHAnUmLC5tP73ZTDjQ6ahKFHQGqWj86PUif24M,24176
+sgis/geopandas_tools/conversion.py,sha256=iX954YEpobmn_R1Ecx_zDU1RlWq_67pfbzMXtwTH04I,24162
 sgis/geopandas_tools/duplicates.py,sha256=TDDM4u1n7SIkyJrOfl1Lno92AmUPqtXBHsj1IUKC0hI,14992
 sgis/geopandas_tools/general.py,sha256=YRpNEdwTHyFdQOdAfbCmYXS7PxoDjXxoagwpteXkYdI,43937
 sgis/geopandas_tools/geocoding.py,sha256=sZjUW52ULhQWDLmU51C9_itBePkDuWkp8swvYaiYmJk,679
@@ -23,15 +23,15 @@ sgis/geopandas_tools/utils.py,sha256=X0pRvB1tWgV_0BCrRS1HU9LtLGnZCpvVPxyqM9JGb0Y
 sgis/helpers.py,sha256=4N6vFWQ3TYVzRHNcWY_fNa_GkFuaZB3vtCkkFND-qs0,9628
 sgis/io/__init__.py,sha256=uyBr20YDqB2bQttrd5q1JuGOvX32A-MSvS7Wmw5f5qg,177
 sgis/io/_is_dapla.py,sha256=wmfkSe98IrLhUg3dtXZusV6OVC8VlY1kbc5EQDf3P-Q,358
-sgis/io/dapla_functions.py,sha256=9NqkL67WdJJHczIWNdChHZp8T5hlXhcYucX7GWN1mCA,31430
+sgis/io/dapla_functions.py,sha256=quq2HkeR0MZSacllDXjVJlthZebT2ATbU6mjsxODOVA,31796
 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=69nPtMChKmso7Yy8X--UoTWJjKmjMF1VHsdLpPKFbA0,9233
+sgis/maps/examine.py,sha256=yfYYxn0C9gH3ygS9MnWfzyY9upjNuGJdPZPXcv4vO_8,9201
 sgis/maps/explore.py,sha256=ANbhScthhwznLEUDDjRUBmniGmkdF9zftbzp9dYHu-U,48210
 sgis/maps/httpserver.py,sha256=I7tTn3hFaTCc-E-T_o9v0nXwMGaS2Xqd4MlWbq8k-J4,3014
-sgis/maps/legend.py,sha256=6L6KspAoYuQbOcs-0vWzMDEL_9qvmGuRR7VIL1wsBMI,26898
-sgis/maps/map.py,sha256=07YK_oHa2z_yw_es06pd-80dV8YTI5mkTyJxyud707Y,30758
+sgis/maps/legend.py,sha256=gTEWCVIZH1cw6ULVVrJqRR4__uOZvrT3xxQ5lhZMVR4,26899
+sgis/maps/map.py,sha256=iGa0o7NlUMErJCYJpVzkpDvuWJc8iDN_-tH2X2WcBlI,30802
 sgis/maps/maps.py,sha256=fLK5WUlQ2YTm7t-8260lYxCFvpZN6j0Y-bVYCyv8NAY,23249
 sgis/maps/norge_i_bilder.json,sha256=G9DIN_2vyn-18UF5wUC-koZxFCbiNxMu0BbCJhMFJUk,15050340
 sgis/maps/thematicmap.py,sha256=ZtV4Hfylr1ST_cPzi11_lFIsTdY3D1o1EZQbPXZLwyM,25187
@@ -48,7 +48,7 @@ sgis/networkanalysis/directednetwork.py,sha256=Mrc2zHip4P5RNxnyffKm-xU832AVQeSHz
 sgis/networkanalysis/finding_isolated_networks.py,sha256=Wg4ILhm7uS9RLOGcL0WN8uZBMJYjdljJc8L5DU5nIPY,3754
 sgis/networkanalysis/network.py,sha256=zV9bAbVdTgTohg2o2RFGy2uhOJrd3Ma57hwIAStxMAQ,7847
 sgis/networkanalysis/networkanalysis.py,sha256=P2kqE1kBxabBnv4h6ort1IiO4W0XlsJn5DrT7IbeG5w,68651
-sgis/networkanalysis/networkanalysisrules.py,sha256=9sXigaCzvKhXFwpeVNMtOiIK3_Hzp9yDpFklmEEAPak,12956
+sgis/networkanalysis/networkanalysisrules.py,sha256=na26iZTpnlwwIEEGswoqMH4W1ZOLN2GIvACZbxn8GPw,12958
 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
@@ -56,12 +56,12 @@ sgis/parallel/parallel.py,sha256=V7O5mEZdfJpcOPrmn2H4bEGtbzA0FggjQ8dGhznjr80,400
 sgis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/raster/base.py,sha256=8JdXXDj8CgJQt5WIkkNbpM5U0pYyQrWQY9dszfUaUQ4,7743
-sgis/raster/image_collection.py,sha256=H7d9c6f-LsGXBK8oCpWBlgd2zbLxYvfNMYllnbrO_rk,121697
+sgis/raster/image_collection.py,sha256=QGTRfIZAOnNiiTuIJOaQJW-g4TIZKvJUtQKwTan1sv4,121876
 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.2.14.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.2.14.dist-info/METADATA,sha256=Hhvwb5ydmsvVBuINCUdiElVrH2SZaZ-XThmYG_rtGA4,11741
-ssb_sgis-1.2.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.2.14.dist-info/RECORD,,
+ssb_sgis-1.2.16.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.2.16.dist-info/METADATA,sha256=Ajra6_V1SJDyLMH0qio2HNTN5KvJdqYON-DSSG21wZM,11704
+ssb_sgis-1.2.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.2.16.dist-info/RECORD,,