fixup! WIP implement filter_bbox on CubeMetadata

Author: soxofaan

openeo/metadata/__init__.py

@@ -149,19 +149,25 @@ def filter_bbox(self, extent: Any) -> SpatialDimensionsXY:
         # TODO: support more types and forms of the extent (geometries, etc.) ... e.g. using the BBoxDict factories?
         if isinstance(extent, dict) and {"west", "east", "south", "north"}.issubset(extent):
             bbox = BBoxDict.from_dict(extent)
-            if bbox["crs"] == self.x.crs and bbox["crs"] == self.y.crs:
+            bbox_crs = bbox.get("crs", SpatialDimension.DEFAULT_CRS)
+            if bbox_crs == self.x.crs and bbox_crs == self.y.crs:
                 # No reprojection needed
-                return SpatialDimensionsXY(
-                    x=self.x.filter_extent(extent=(bbox["west"], bbox["east"])),
-                    y=self.y.filter_extent(extent=(bbox["south"], bbox["north"])),
-                )
+                extent_x = bbox["west"], bbox["east"]
+                extent_y = bbox["south"], bbox["north"]
             else:
                 # TODO: reproject
-                pass
-        # As lenient fallback, handle as non-concrete extent
+                extent_x, extent_y = _NonConcreteExtent(), _NonConcreteExtent()
+        elif isinstance(extent, _EmptyExtent):
+            extent_x, extent_y = _EmptyExtent(), _EmptyExtent()
+        elif isinstance(extent, _NonConcreteExtent):
+            extent_x, extent_y = _NonConcreteExtent(), _NonConcreteExtent()
+        else:
+            # As lenient fallback, handle as non-concrete extent
+            extent_x, extent_y = _NonConcreteExtent(), _NonConcreteExtent()
+
         return SpatialDimensionsXY(
-            x=self.x.filter_extent(extent=_NonConcreteExtent()),
-            y=self.y.filter_extent(extent=_NonConcreteExtent()),
+            x=self.x.filter_extent(extent=extent_x),
+            y=self.y.filter_extent(extent=extent_y),
         )
 
 

tests/metadata/test_metadata.py

@@ -197,6 +197,67 @@ def test_filter_extent_parameterized(self):
         assert isinstance(dim2.extent, _NonConcreteExtent)
 
 
+class TestSpatialDimensionsXY:
+    def test_basic(self):
+        dim_x = SpatialDimension(name="x", axis="x", extent=(3, 6), crs=4326)
+        dim_y = SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326)
+        dim_xy = SpatialDimensionsXY(dim_x, dim_y)
+        assert (dim_xy.x.name, dim_xy.x.axis, dim_xy.x.extent) == ("x", "x", (3, 6))
+        assert (dim_xy.y.name, dim_xy.y.axis, dim_xy.y.extent) == ("y", "y", (49, 52))
+
+    def test_eq_tuple(self):
+        dim_x = SpatialDimension(name="x", axis="x", extent=(3, 6), crs=4326)
+        dim_y = SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326)
+        dim_xy = SpatialDimensionsXY(dim_x, dim_y)
+        assert dim_xy == (
+            SpatialDimension(name="x", axis="x", extent=(3, 6), crs=4326),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+        )
+
+    @pytest.mark.parametrize(
+        ["extent", "expected"],
+        [
+            ({"west": 4, "south": 50, "east": 5, "north": 51, "crs": 4326}, ((4, 5), (50, 51))),
+            ({"west": 1, "south": 40, "east": 4, "north": 50, "crs": 4326}, ((2, 4), (49, 50))),
+            ({"west": 5, "south": 50, "east": 8, "north": 60, "crs": 4326}, ((5, 7), (50, 52))),
+        ],
+    )
+    def test_filter_bbox_simple(self, extent, expected):
+        """Simple case: all in same CRS (EPSG:4326)"""
+        dim_xy = SpatialDimensionsXY(
+            SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+        )
+        dim_xy_filtered = dim_xy.filter_bbox(extent=extent)
+
+        assert (dim_xy.x.extent, dim_xy.y.extent) == ((2, 7), (49, 52))
+        assert (dim_xy_filtered.x.extent, dim_xy_filtered.y.extent) == expected
+
+    def test_filter_bbox_empty(self):
+        dim_xy = SpatialDimensionsXY(
+            SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+        )
+        extent = _EmptyExtent()
+        dim_xy_filtered = dim_xy.filter_bbox(extent=extent)
+
+        assert (dim_xy.x.extent, dim_xy.y.extent) == ((2, 7), (49, 52))
+        assert dim_xy_filtered.x.extent == _EmptyExtent()
+        assert dim_xy_filtered.y.extent == _EmptyExtent()
+
+    def test_filter_bbox_non_concrete(self):
+        dim_xy = SpatialDimensionsXY(
+            SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+        )
+        extent = openeo.api.process.Parameter.spatial_extent()
+        dim_xy_filtered = dim_xy.filter_bbox(extent=extent)
+
+        assert (dim_xy.x.extent, dim_xy.y.extent) == ((2, 7), (49, 52))
+        assert isinstance(dim_xy_filtered.x.extent, _NonConcreteExtent)
+        assert isinstance(dim_xy_filtered.y.extent, _NonConcreteExtent)
+
+
 class TestBand:
     def test_band_minimal(self):
         band = Band("red")
@@ -1396,6 +1457,58 @@ def test_repr_html_with_dimensions(self):
             regex_flags=re.DOTALL | re.VERBOSE,
         )
 
+    @pytest.mark.parametrize(
+        ["spatial_extent", "expected"],
+        [
+            ({"west": 3, "east": 5, "south": 46, "north": 51}, ((3, 5), (49, 51))),
+            ({"west": 3, "east": 5, "south": 46, "north": 51, "crs": 4326}, ((3, 5), (49, 51))),
+            ({"west": 3, "east": 5, "south": 46, "north": 51, "crs": "EPSG:4326"}, ((3, 5), (49, 51))),
+        ],
+    )
+    def test_filter_bbox_basic(self, spatial_extent, expected):
+        metadata1 = CubeMetadata(
+            dimensions=[
+                SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326),
+                SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+                TemporalDimension(name="t", extent=("2021-01-01", None)),
+            ]
+        )
+        metadata2 = metadata1.filter_bbox(extent=spatial_extent)
+
+        assert metadata1.spatial_dimensions == (
+            SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326, step=None),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326, step=None),
+        )
+        expected_x, expected_y = expected
+        assert metadata2.spatial_dimensions == (
+            SpatialDimension(name="x", axis="x", extent=expected_x, crs=4326, step=None),
+            SpatialDimension(name="y", axis="y", extent=expected_y, crs=4326, step=None),
+        )
+
+    def test_filter_bbox_parameterized(self):
+        metadata1 = CubeMetadata(
+            dimensions=[
+                SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326),
+                SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326),
+                TemporalDimension(name="t", extent=("2021-01-01", None)),
+            ]
+        )
+        spatial_extent = openeo.api.process.Parameter.spatial_extent()
+        metadata2 = metadata1.filter_bbox(extent=spatial_extent)
+
+        assert metadata1.spatial_dimensions == (
+            SpatialDimension(name="x", axis="x", extent=(2, 7), crs=4326, step=None),
+            SpatialDimension(name="y", axis="y", extent=(49, 52), crs=4326, step=None),
+        )
+        assert metadata2.spatial_dimensions == (
+            SpatialDimension(
+                name="x", axis="x", extent=dirty_equals.IsInstance(_NonConcreteExtent), crs=4326, step=None
+            ),
+            SpatialDimension(
+                name="y", axis="y", extent=dirty_equals.IsInstance(_NonConcreteExtent), crs=4326, step=None
+            ),
+        )
+
 
 class TestStacMetadataParser:
     @pytest.mark.parametrize(