v0.1.3

earthdaily · May 22, 2024 · 81f8bfd · 81f8bfd
2 parents a894a2c + 22156f4
commit 81f8bfd
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.3] - 2024-05-22
+
+### Changed
+
+- `mask_with` now supports list. If so, if the first mask type is not available for a collection, it will switch to the second mask.
+
 ## [0.1.2] - 2024-05-15
 
 ### Fixed

diff --git a/earthdaily/__init__.py b/earthdaily/__init__.py
@@ -5,4 +5,4 @@
 # to hide warnings from rioxarray or nano seconds conversion
 warnings.filterwarnings("ignore")
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
diff --git a/earthdaily/earthdatastore/__init__.py b/earthdaily/earthdatastore/__init__.py
@@ -527,7 +527,7 @@ def datacube(
         assets: None | list | dict = None,
         intersects: (gpd.GeoDataFrame | str | dict) = None,
         bbox=None,
-        mask_with: (None | str) = None,
+        mask_with: (None | str | list) = None,
         mask_statistics: bool | int = False,
         clear_cover: (int | float) = None,
         prefer_alternate: (str | bool) = "download",
@@ -587,8 +587,9 @@ def datacube(
             DESCRIPTION. The default is None.
         bbox : TYPE, optional
             DESCRIPTION. The default is None.
-        mask_with : (None, str), optional
-            "native" mask, or "ag_cloud_mask".
+        mask_with : (None, str, list), optional
+            "native" mask, or "ag_cloud_mask", or ["ag_cloud_mask","native"],
+            and so if ag_cloud_mask is not available, will switch to native.
             The default is None.
         mask_statistics : bool | int, optional
             DESCRIPTION. The default is False.
@@ -634,11 +635,17 @@ def datacube(
         if isinstance(collections, str):
             collections = [collections]
 
+        if intersects is not None:
+            intersects = cube_utils.GeometryManager(intersects).to_geopandas()
+            self.intersects = intersects
+
         if mask_with:
             if mask_with not in mask._available_masks:
-                raise ValueError(
-                    f"Specified mask '{mask_with}' is not available. Currently available masks provider are : {mask._available_masks}"
+                logging.log(
+                    level=logging.INFO,
+                    msg=f"Specified mask '{mask_with}' is not available. Currently available masks provider are : {mask._available_masks}",
                 )
+
             if mask_with == "ag_cloud_mask":
                 search_kwargs = self._update_search_kwargs_for_ag_cloud_mask(
                     search_kwargs, collections[0]
@@ -648,9 +655,6 @@ def datacube(
                 if isinstance(assets, list):
                     assets.append(mask_with)
 
-        if intersects is not None:
-            intersects = cube_utils.GeometryManager(intersects).to_geopandas()
-            self.intersects = intersects
         items = self.search(
             collections=collections,
             bbox=bbox,

diff --git a/earthdaily/earthdatastore/cube_utils/__init__.py b/earthdaily/earthdatastore/cube_utils/__init__.py
@@ -17,8 +17,29 @@
 __all__ = ["GeometryManager", "rioxarray", "zonal_stats", "zonal_stats_numpy"]
 
 
+def _datacube_masks(method, *args, **kwargs):
+    @wraps(method)
+    def _impl(self, *args, **kwargs):
+        mask_with = kwargs.get("mask_with", None)
+        if isinstance(mask_with, list) and len(mask_with) > 1:
+            kwargs.pop("mask_with")
+            for mask in mask_with:
+                try:
+                    datacube = method(self, mask_with=mask, *args, **kwargs)
+                    break
+                except Warning:
+                    # if warning about no items for ag_cloud_mask for example
+                    continue
+        else:
+            datacube = method(self, *args, **kwargs)
+        return datacube
+
+    return _impl
+
+
 def _datacubes(method):
     @wraps(method)
+    @_datacube_masks
     def _impl(self, *args, **kwargs):
         collections = kwargs.get("collections", args[0] if len(args) > 0 else None)
         if isinstance(collections, list) and len(collections) > 1:

diff --git a/earthdaily/earthdatastore/cube_utils/asset_mapper/asset_mapper_config.json b/earthdaily/earthdatastore/cube_utils/asset_mapper/asset_mapper_config.json
@@ -388,7 +388,8 @@
     ],
     "goes": [
         {
-            "OR_ABI-L2-AODF-M6_G16_s20233490810206_e20233490819514_c20233490820523.nc": "OR_ABI-L2-AODF-M6_G16_s20233490810206_e20233490819514_c20233490820523.nc"
+            "OR_ABI-L2-AODF-M6_G16_s20233490810206_e20233490819514_c20233490820523.nc": "OR_ABI-L2-AODF-M6_G16_s20233490810206_e20233490819514_c20233490820523.nc",
+            "OR_ABI-L2-ACMF-M6_G18_s20241430900220_e20241430909528_c20241430910280.nc": "OR_ABI-L2-ACMF-M6_G18_s20241430900220_e20241430909528_c20241430910280.nc"
         }
     ],
     "himawari-l1b": [
@@ -408,7 +409,23 @@
             "HS_H09_20231215_0550_B13_FLDK_R20_S0110.DAT.bz2": "HS_H09_20231215_0550_B13_FLDK_R20_S0110.DAT.bz2",
             "HS_H09_20231215_0550_B14_FLDK_R20_S0110.DAT.bz2": "HS_H09_20231215_0550_B14_FLDK_R20_S0110.DAT.bz2",
             "HS_H09_20231215_0550_B15_FLDK_R20_S0110.DAT.bz2": "HS_H09_20231215_0550_B15_FLDK_R20_S0110.DAT.bz2",
-            "HS_H09_20231215_0550_B16_FLDK_R20_S0110.DAT.bz2": "HS_H09_20231215_0550_B16_FLDK_R20_S0110.DAT.bz2"
+            "HS_H09_20231215_0550_B16_FLDK_R20_S0110.DAT.bz2": "HS_H09_20231215_0550_B16_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B01_FLDK_R10_S0110.DAT.bz2": "HS_H09_20240522_0550_B01_FLDK_R10_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B02_FLDK_R10_S0110.DAT.bz2": "HS_H09_20240522_0550_B02_FLDK_R10_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B03_FLDK_R05_S0110.DAT.bz2": "HS_H09_20240522_0550_B03_FLDK_R05_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B04_FLDK_R10_S0110.DAT.bz2": "HS_H09_20240522_0550_B04_FLDK_R10_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B05_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B05_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B06_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B06_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B07_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B07_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B08_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B08_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B09_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B09_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B10_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B10_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B11_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B11_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B12_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B12_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B13_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B13_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B14_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B14_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B15_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B15_FLDK_R20_S0110.DAT.bz2",
+            "HS_H09_20240522_0550_B16_FLDK_R20_S0110.DAT.bz2": "HS_H09_20240522_0550_B16_FLDK_R20_S0110.DAT.bz2"
         }
     ],
     "himawari-l2-cloud": [
@@ -587,7 +604,8 @@
             "annotation/calibration/noise-iw-vh.xml": "annotation/calibration/noise-iw-vh.xml",
             "annotation/calibration/noise-iw-vv.xml": "annotation/calibration/noise-iw-vv.xml",
             "annotation/calibration/calibration-iw-vh.xml": "annotation/calibration/calibration-iw-vh.xml",
-            "annotation/calibration/calibration-iw-vv.xml": "annotation/calibration/calibration-iw-vv.xml"
+            "annotation/calibration/calibration-iw-vv.xml": "annotation/calibration/calibration-iw-vv.xml",
+            "report-20240521T170707.pdf": "report-20240521T170707.pdf"
         }
     ],
     "sentinel-1-rtc": [
@@ -692,7 +710,205 @@
     ],
     "sentinel-2-methane-product": [
         {
-            "colourized_geotiff": "colourized_geotiff"
+            "colourized_geotiff": "colourized_geotiff",
+            "thumbnail": "thumbnail"
+        }
+    ],
+    "ecostress-eco-l2t-lste-002": [
+        {
+            "browse": "browse",
+            "metadata": "metadata",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_QC": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_QC",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_LST": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_LST",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_cloud": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_cloud",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_water": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_water",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_EmisWB": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_EmisWB",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_height": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_height",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_LST_err": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_LST_err",
+            "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_view_zenith": "002/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01/ECOv002_L2T_LSTE_33232_015_18KYE_20240516T193004_0711_01_view_zenith"
+        }
+    ],
+    "esa-worldcover-landcover-2020-v100": [
+        {
+            "ESA_WORLDCOVER_10M_MAP": "ESA_WORLDCOVER_10M_MAP"
+        }
+    ],
+    "esa-worldcover-landcover-2021-v200": [
+        {
+            "ESA_WORLDCOVER_10M_MAP": "ESA_WORLDCOVER_10M_MAP"
+        }
+    ],
+    "esa-worldcover-s1-vvvhratio-2020-v100": [
+        {
+            "s1_vvvhratio_2020": "s1_vvvhratio_2020"
+        }
+    ],
+    "esa-worldcover-s1-vvvhratio-2021-v200": [
+        {
+            "s1_vvvhratio_2021": "s1_vvvhratio_2021"
+        }
+    ],
+    "esa-worldcover-s2-nvdi-2020-v100": [
+        {
+            "s2_ndvi_2020": "s2_ndvi_2020"
+        }
+    ],
+    "esa-worldcover-s2-nvdi-2021-v200": [
+        {
+            "s2_ndvi_2021": "s2_ndvi_2021"
+        }
+    ],
+    "esa-worldcover-s2-rgbnir-2020-v100": [
+        {
+            "s2_rgbnir_2020": "s2_rgbnir_2020"
+        }
+    ],
+    "esa-worldcover-s2-rgbnir-2021-v200": [
+        {
+            "s2_rgbnir_2021": "s2_rgbnir_2021"
+        }
+    ],
+    "esa-worldcover-s2-swir-2020-v100": [
+        {
+            "s2_swir_2020": "s2_swir_2020"
+        }
+    ],
+    "esa-worldcover-s2-swir-2021-v200": [
+        {
+            "s2_swir_2021": "s2_swir_2021"
+        }
+    ],
+    "lulc-classification-map": [
+        {
+            "thumbnail": "thumbnail",
+            "lulc-classification-map": "lulc-classification-map"
+        }
+    ],
+    "modis-mod11-l2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-mod11a2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-mod21-l2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-mod21a2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-myd11-l2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-myd11a2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-myd21-l2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "modis-myd21a2-061": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "metadata": "metadata"
+        }
+    ],
+    "nst-observer-catalog": [
+        {
+            "browse": "browse",
+            "thumbnail": "thumbnail",
+            "cloud_mask": "cloud_mask"
+        }
+    ],
+    "viirs-vj121-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vj121a1d-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vj121a1n-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vj121a2-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vnp21-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vnp21a1d-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vnp21a1n-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
+        }
+    ],
+    "viirs-vnp21a2-002": [
+        {
+            "data": "data",
+            "browse": "browse",
+            "opendap": "opendap",
+            "metadata": "metadata"
         }
     ]
 }