ssb-sgis 1.3.0__py3-none-any.whl → 1.3.2__py3-none-any.whl

sgis/maps/wms.py

@@ -27,11 +27,6 @@ from ..geopandas_tools.conversion import to_shapely
 from ..geopandas_tools.sfilter import sfilter
 from ..raster.image_collection import Band
 
-JSON_PATH = Path(__file__).parent / "norge_i_bilder.json"
-
-# JSON_YEARS = tuple(range(1900, datetime.datetime.now().year + 1))
-JSON_YEARS = tuple(range(2006, datetime.datetime.now().year + 1))
-
 DEFAULT_YEARS: tuple[int] = tuple(
     range(
         int(datetime.datetime.now().year) - 10,
@@ -100,6 +95,8 @@ class NorgeIBilderWms(WmsLoader):
     """
 
     url: str = "https://wms.geonorge.no/skwms1/wms.nib-prosjekter"
+    _min_year: int = 1935
+    _json_path = Path(__file__).parent / "norge_i_bilder.json"
 
     def __init__(
         self,
@@ -116,7 +113,7 @@ class NorgeIBilderWms(WmsLoader):
         self.show = show
         self._use_json = _use_json
 
-        if self._use_json and all(year in JSON_YEARS for year in self.years):
+        if self._use_json:
             self._load_from_json()
         else:
             self._tiles = None
@@ -132,8 +129,12 @@ class NorgeIBilderWms(WmsLoader):
             r"<northBoundLatitude>(.*?)</northBoundLatitude>.*?</EX_GeographicBoundingBox>"
         )
 
+        url: str = (
+            "https://wms.geonorge.no/skwms1/wms.nib-prosjekter?SERVICE=WMS&REQUEST=GetCapabilities"
+        )
+
         all_tiles: list[dict] = []
-        with urlopen(self.url) as file:
+        with urlopen(url) as file:
             xml_data: str = file.read().decode("utf-8")
 
             for text in xml_data.split('<Layer queryable="1">')[1:]:
@@ -333,7 +334,7 @@ class NorgeIBilderWms(WmsLoader):
     def _load_from_json(self) -> None:
         """Load tiles from json file."""
         try:
-            with open(JSON_PATH, encoding="utf-8") as file:
+            with open(self._json_path, encoding="utf-8") as file:
                 self._tiles = json.load(file)
         except FileNotFoundError:
             self._tiles = None

sgis/raster/image_collection.py

@@ -373,6 +373,10 @@ class ImageCollectionGroupBy:
         """Iterate over the group values and the ImageCollection groups themselves."""
         return iter(self.data)
 
+    def __reversed__(self) -> Iterator[tuple[tuple[Any, ...], "ImageCollection"]]:
+        """Iterate over the group values and the ImageCollection groups themselves."""
+        return iter(reversed(self.data))
+
     def __len__(self) -> int:
         """Number of ImageCollection groups."""
         return len(self.data)
@@ -573,9 +577,7 @@ class _ImageBase:
         Used in __init__ to select relevant paths fast.
         """
         df = pd.DataFrame({"file_path": list(file_paths)})
-
         df["file_name"] = df["file_path"].apply(lambda x: Path(x).name)
-
         df["image_path"] = df["file_path"].apply(
             lambda x: _fix_path(str(Path(x).parent))
         )
@@ -605,12 +607,10 @@ class _ImageBase:
         grouped["imagename"] = grouped["image_path"].apply(
             lambda x: _fix_path(Path(x).name)
         )
-
         if self.image_patterns and len(grouped):
             grouped = _get_regexes_matches_for_df(
                 grouped, "imagename", self.image_patterns
             )
-
         return grouped
 
     def copy(self) -> "_ImageBase":
@@ -1498,6 +1498,7 @@ class Image(_ImageBandBase):
         df: pd.DataFrame | None = None,
         nodata: int | None = None,
         all_file_paths: list[str] | None = None,
+        use_json_metadata: bool = True,
         **kwargs,
     ) -> None:
         """Image initialiser."""
@@ -1539,9 +1540,12 @@ class Image(_ImageBandBase):
         else:
             self._all_file_paths = None
 
-        if self.metadata is None or (
-            not len(self.metadata)
-            and "metadata.json" in {Path(x).name for x in self._all_file_paths}
+        if use_json_metadata and (
+            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(
                 next(
@@ -2191,7 +2195,7 @@ class ImageCollection(_ImageBase):
         index_aligned_kwargs: dict | None = None,
         masked: bool = True,
         processes: int | None = None,
-    ) -> np.ndarray | tuple[np.ndarray] | None:
+    ) -> PixelwiseResults:
         """Run a function for each pixel.
 
         The function should take a 1d array as first argument. This will be
@@ -2218,7 +2222,7 @@ class ImageCollection(_ImageBase):
         ):
             mask_array = np.array(
                 [
-                    (band.values.mask) | (band.values.data == self.nodata)
+                    (band.values.mask)  # | (band.values.data == self.nodata)
                     for img in self
                     for band in img
                 ]
@@ -2680,10 +2684,18 @@ class ImageCollection(_ImageBase):
         if self._images is None:
             return self
 
+        if not hasattr(other, "crs") or other.crs is None:
+            try:
+                crs = self.crs
+            except ValueError as e:
+                raise ValueError("Cannot filter bounds by object without crs") from e
+        else:
+            crs = other.crs
         other = to_shapely(other)
 
+        union_func = functools.partial(_union_all_and_to_crs, crs=crs)
         with ThreadPoolExecutor() as executor:
-            bounds_iterable: Generator[Polygon] = executor.map(_union_all, self)
+            bounds_iterable: Generator[Polygon] = executor.map(union_func, self)
 
         intersects_list: pd.Series = GeoSeries(list(bounds_iterable)).intersects(other)
 
@@ -3426,8 +3438,8 @@ def _open_raster(path: str | Path) -> rasterio.io.DatasetReader:
         return rasterio.open(file)
 
 
-def _union_all(obj: _ImageBase) -> Polygon:
-    return obj.union_all()
+def _union_all_and_to_crs(obj: _ImageBase, crs) -> Polygon:
+    return GeoSeries([obj.union_all()], crs=obj.crs).to_crs(crs).union_all()
 
 
 def _read_mask_array(self: Band | Image, **kwargs) -> np.ndarray:

{ssb_sgis-1.3.0.dist-info → ssb_sgis-1.3.2.dist-info}/METADATA

@@ -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.dist-info → ssb_sgis-1.3.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ sgis/conf.py,sha256=pLqmvIKoKmXoW8chja3iQpbDUp9Z39vzl97MGH8ZHW0,2614
 sgis/debug_config.py,sha256=Tfr19kU46hSkkspsIJcrUWvlhaL4U3-f8xEPkujSCAQ,593
 sgis/exceptions.py,sha256=WNaEBPNNx0rmz-YDzlFX4vIE7ocJQruUTqS2RNAu2zU,660
 sgis/geopandas_tools/__init__.py,sha256=bo8lFMcltOz7TtWAi52_ekR2gd3mjfBfKeMDV5zuqFY,28
-sgis/geopandas_tools/bounds.py,sha256=PsA_rPEDIS0CopLtolWCB01UEdxc8gtsNbUqMd5AOLY,23855
+sgis/geopandas_tools/bounds.py,sha256=Os9o4EZ1ax38reW-9cdJzgKHoX2il9lUEIZ7wc5CpBQ,23997
 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
@@ -23,7 +23,7 @@ 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=sFx-RODoYkuag0ECeeJetj3u9wm-eFoYq40aId_j5dk,31840
+sgis/io/dapla_functions.py,sha256=ZWtUv58GY0RowUGY7vJBk1rrpjoZq8iVZEmSV3GJShU,31883
 sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,10 +33,10 @@ sgis/maps/httpserver.py,sha256=I7tTn3hFaTCc-E-T_o9v0nXwMGaS2Xqd4MlWbq8k-J4,3014
 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/norge_i_bilder.json,sha256=wUYY8VTanI-C4bpNk7bmnQb8S-S3CBUIRLgdOoydnoQ,20197311
 sgis/maps/thematicmap.py,sha256=ZtV4Hfylr1ST_cPzi11_lFIsTdY3D1o1EZQbPXZLwyM,25187
 sgis/maps/tilesources.py,sha256=F4mFHxPwkiPJdVKzNkScTX6xbJAMIUtlTq4mQ83oguw,1746
-sgis/maps/wms.py,sha256=wKRZUd3YEwZnMBKmH2YuQCvILrzTl1hq-NMauQz4rs8,12505
+sgis/maps/wms.py,sha256=sCVpKxH1Rsd14GECW7BFh8yaWngpVWYvw9Yhuez1yW8,12482
 sgis/networkanalysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/networkanalysis/_get_route.py,sha256=3m5xQdQqGtt51vcI5fcmYQAOQCeBtL6sorDoPxBNf84,7818
 sgis/networkanalysis/_od_cost_matrix.py,sha256=zkyPX7ObT996ahaFJ2oI0D0SqQWbWyfy_qLtXwValPg,3434
@@ -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=QGTRfIZAOnNiiTuIJOaQJW-g4TIZKvJUtQKwTan1sv4,121876
+sgis/raster/image_collection.py,sha256=ZWAJzL8CQOMqlDlyZ5idZlWZRnlL0wmnryPwXww7Z1Y,122584
 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.3.0.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.3.0.dist-info/METADATA,sha256=Nt_je5z3VZ4nVzhpURSXYj2Q252Dg515qry_xZMxndE,11624
-ssb_sgis-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.3.0.dist-info/RECORD,,
+ssb_sgis-1.3.2.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.3.2.dist-info/METADATA,sha256=bXRithGOpGcmOzDI1FkZ-trISx9unb2erI1XXwfa91w,11624
+ssb_sgis-1.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.3.2.dist-info/RECORD,,