Merge pull request #106 from c-hydro/tools_v1.3.3

Tools v1.3.3
c-hydro · Oct 6, 2024 · e9487a6 · e9487a6
2 parents db17562 + 0cf1dc0
commit e9487a6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/door/base_downloaders.py b/door/base_downloaders.py
@@ -78,9 +78,13 @@ def set_bounds(self, bounds: None|BoundingBox|list[float]|tuple[float]) -> None:
         if bounds is None:
             return
         elif isinstance(bounds, (list, tuple)):
-            bounds = BoundingBox(*bounds)
+            _bounds = BoundingBox(*bounds)
+        elif isinstance(bounds, Dataset):
+            _bounds = BoundingBox.from_dataset(bounds)
+        elif isinstance(bounds, str):
+            _bounds = BoundingBox.from_file(bounds)
 
-        self.bounds = bounds
+        self.bounds = _bounds
 
     def set_destination(self, destination: Dataset|dict|str|None) -> None:
         """

diff --git a/door/data_sources/cds/cds_downloader.py b/door/data_sources/cds/cds_downloader.py
@@ -7,7 +7,7 @@ class CDSDownloader(APIDownloader):
 
     name = "CDS_downloader"
     apikey_env_vars = 'CDSAPI_KEY' # this should be in the form UID:API_KEY already
-    cds_url = 'https://cds-beta.climate.copernicus.eu/api'
+    cds_url = 'https://cds.climate.copernicus.eu/api'
 
     def __init__(self, dataset) -> None:
 

diff --git a/door/tools b/door/tools
diff --git a/door/utils/space.py b/door/utils/space.py
@@ -8,6 +8,8 @@
 import xarray as xr
 import rioxarray as rxr
 
+from ..tools.data import Dataset
+
 class BoundingBox():
 
     default_datum = 'EPSG:4326'
@@ -34,6 +36,15 @@ def __init__(self,
 
         # buffer the bounding box
         self.buffer_bbox(buffer)
+
+    @staticmethod
+    def from_dataset(dataset: Dataset, buffer: float = 0.0):
+        data:xr.DataArray = dataset.get_data()
+
+        # get the bounding box of the data
+        left, bottom, right, top = data.rio.bounds()
+
+        return BoundingBox(left, bottom, right, top, datum = data.rio.crs.to_wkt(), buffer = buffer)
 
     @staticmethod
     def from_file(grid_file, buffer: float = 0.0):

diff --git a/setup.py b/setup.py
@@ -32,13 +32,14 @@
         'dask',
         'scipy',
         'ecmwf-opendata >= 0.2.0',
-        'cdsapi',
+        'cdsapi >= 0.7.2',
         'ftpretty',
         'pandas',
         'drops2 @ git+https://github.com/CIMAFoundation/drops2.git',
         'matplotlib',
         'geopandas',
-        'boto3'
+        'boto3',
+        'img2pdf'
     ],
     python_requires='>=3.10',
     test_suite='tests',
+2 −1		config/options.py
+241 −34		data/dataset.py
+38 −3		data/io_utils.py
+3 −3		data/local_dataset.py
+1 −1		data/memory_dataset.py
+7 −4		data/s3_dataset.py
+1 −10		notification/email_notification.py
+12 −3		thumbnails/colors.py
+12 −7		thumbnails/thumbnail.py