Merge pull request #135 from Open-EO/s1-extraction-fixes

S1 extraction fixes
Open-EO · Aug 8, 2024 · 088dc15 · 088dc15
2 parents 15627c5 + 66272db
commit 088dc15
Show file tree

Hide file tree

Showing 6 changed files with 267 additions and 58 deletions.
diff --git a/src/openeo_gfmap/fetching/generic.py b/src/openeo_gfmap/fetching/generic.py
@@ -116,6 +116,10 @@ def generic_default_processor(cube: openeo.DataCube, **params):
             "fetch": partial(_get_generic_fetcher, collection_name="AGERA5"),
             "preprocessor": partial(_get_generic_processor, collection_name="AGERA5"),
         },
+        Backend.CDSE_STAGING: {
+            "fetch": partial(_get_generic_fetcher, collection_name="AGERA5"),
+            "preprocessor": partial(_get_generic_processor, collection_name="AGERA5"),
+        },
         Backend.FED: {
             "fetch": partial(_get_generic_fetcher, collection_name="AGERA5"),
             "preprocessor": partial(_get_generic_processor, collection_name="AGERA5"),
@@ -134,6 +138,12 @@ def generic_default_processor(cube: openeo.DataCube, **params):
                 _get_generic_processor, collection_name="COPERNICUS_30"
             ),
         },
+        Backend.CDSE_STAGING: {
+            "fetch": partial(_get_generic_fetcher, collection_name="COPERNICUS_30"),
+            "preprocessor": partial(
+                _get_generic_processor, collection_name="COPERNICUS_30"
+            ),
+        },
         Backend.FED: {
             "fetch": partial(_get_generic_fetcher, collection_name="COPERNICUS_30"),
             "preprocessor": partial(

diff --git a/src/openeo_gfmap/fetching/s1.py b/src/openeo_gfmap/fetching/s1.py
@@ -67,16 +67,14 @@ def s1_grd_fetch_default(
         """
         bands = convert_band_names(bands, BASE_SENTINEL1_GRD_MAPPING)
 
-        load_collection_parameters = params.get("load_collection", {})
-
         cube = _load_collection(
             connection,
             bands,
             collection_name,
             spatial_extent,
             temporal_extent,
             fetch_type,
-            **load_collection_parameters,
+            **params,
         )
 
         if fetch_type is not FetchType.POINT and isinstance(spatial_extent, GeoJSON):