Support collection "cube:dimensions" merging

ref: openEOPlatform/SRR1_notebooks#9
Open-EO · Feb 4, 2022 · 596eb0d · 596eb0d
1 parent 9bcbbfe
commit 596eb0d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/openeo_aggregator/backend.py b/src/openeo_aggregator/backend.py
@@ -160,7 +160,10 @@ def _merge_collection_metadata(self, by_backend: Dict[str, dict]) -> dict:
             },
         }
         result["links"] = list(getter.union("links"))
-        # TODO         cube_dimensions = getter.get("cube:dimensions") ...
+        # TODO: combine cube:dimensions smarter?
+        cube_dimensions = getter.first("cube:dimensions")
+        if cube_dimensions:
+            result["cube:dimensions"] = cube_dimensions
         # TODO merge existing summaries?
         result["summaries"] = {
             # TODO: use a more robust/user friendly backend pointer than backend id (which is internal implementation detail)

diff --git a/tests/test_backend.py b/tests/test_backend.py
@@ -193,6 +193,10 @@ def test_get_all_metadata_common_collections_merging(
                 "spatial": {"bbox": [[-10, 20, 30, 50]]},
                 "temporal": {"interval": [["2011-01-01T00:00:00Z", "2019-01-01T00:00:00Z"]]}
             },
+            "cube:dimensions": {
+                "bands": {"type": "bands", "values": ["B01", "B02"]},
+                "x": {"type": "spatial", "axis": "x"}
+            },
             "links": [
                 {"rel": "license", "href": "https://spdx.org/licenses/MIT.html"},
             ],
@@ -209,6 +213,10 @@ def test_get_all_metadata_common_collections_merging(
                 "spatial": {"bbox": [[-20, -20, 40, 40]]},
                 "temporal": {"interval": [["2012-02-02T00:00:00Z", "2019-01-01T00:00:00Z"]]}
             },
+            "cube:dimensions": {
+                "bands": {"type": "bands", "values": ["B01", "B02"]},
+                "y": {"type": "spatial", "axis": "y"}
+            },
             "links": [
                 {"rel": "license", "href": "https://spdx.org/licenses/Apache-1.0.html"},
             ],
@@ -227,6 +235,10 @@ def test_get_all_metadata_common_collections_merging(
                     "spatial": {"bbox": [[-10, 20, 30, 50], [-20, -20, 40, 40]]},
                     "temporal": {"interval": [["2011-01-01T00:00:00Z", "2019-01-01T00:00:00Z"],
                                               ["2012-02-02T00:00:00Z", "2019-01-01T00:00:00Z"]]}},
+                "cube:dimensions": {
+                    "bands": {"type": "bands", "values": ["B01", "B02"]},
+                    "x": {"type": "spatial", "axis": "x"}
+                },
                 "license": "various",
                 "providers": [{"name": "ESA", "roles": ["producer"]}, {"name": "ESA", "roles": ["licensor"]}],
                 "summaries": {"provider:backend": ["b1", "b2"]},