Preserve non-spatial dims in CubeMetadata.resample_cube_spatial()

ref Open-EO/openeo-python-driver#397

Author: soxofaan

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Preserve original non-spatial dimensions in `CubeMetadata.resample_cube_spatial()` ([Open-EO/openeo-python-driver#397](https://github.com/Open-EO/openeo-python-driver/issues/397))
+
 
 ## [0.40.0] - 2025-04-14
 

openeo/_version.py

@@ -1 +1 @@
-__version__ = "0.41.0a1"
+__version__ = "0.41.0a2"

openeo/metadata.py

@@ -486,7 +486,10 @@ def resample_spatial(
         return self._clone_and_update(dimensions=dimensions)
 
     def resample_cube_spatial(self, target: CubeMetadata) -> CubeMetadata:
-        return self._clone_and_update(dimensions=list(target._dimensions))
+        # Replace spatial dimensions with ones from target, but keep other dimensions
+        dimensions = [d for d in (self._dimensions or []) if not isinstance(d, SpatialDimension)]
+        dimensions.extend(target.spatial_dimensions)
+        return self._clone_and_update(dimensions=dimensions)
 
 
 class CollectionMetadata(CubeMetadata):

tests/rest/datacube/test_datacube.py

@@ -898,6 +898,28 @@ def test_resample_cube_spatial_no_source_metadata(s2cube, s2cube_without_metadat
     ]
 
 
+def test_resample_cube_spatial_preserve_non_spatial(s2cube):
+    cube_xytb = s2cube.resample_spatial(resolution=11, projection=32631)
+    cube_xyt = s2cube.reduce_dimension(dimension="bands", reducer="mean").resample_spatial(
+        resolution=22, projection=32631
+    )
+    cube_xyb = s2cube.reduce_dimension(dimension="t", reducer="mean").resample_spatial(resolution=33, projection=32631)
+
+    result = cube_xyt.resample_cube_spatial(target=cube_xytb)
+    assert result.metadata.dimension_names() == ["t", "x", "y"]
+    assert result.metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=None, crs=32631, step=11),
+        SpatialDimension(name="y", extent=None, crs=32631, step=11),
+    ]
+
+    result = cube_xyb.resample_cube_spatial(target=cube_xyt)
+    assert result.metadata.dimension_names() == ["bands", "x", "y"]
+    assert result.metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=None, crs=32631, step=22),
+        SpatialDimension(name="y", extent=None, crs=32631, step=22),
+    ]
+
+
 def test_resample_cube_spatial_no_target_metadata(s2cube, s2cube_without_metadata):
     cube = s2cube.resample_spatial(resolution=10, projection=32631)
     target = s2cube_without_metadata

tests/test_metadata.py

@@ -1110,3 +1110,47 @@ def test_metadata_resample_cube_spatial(cube_metadata):
         SpatialDimension(name="x", extent=[2, 7], crs=32631, step=11),
         SpatialDimension(name="y", extent=[49, 52], crs=32631, step=22),
     ]
+
+
+def test_metadata_resample_cube_spatial_preserve_non_spatial():
+    xy1 = [
+        SpatialDimension(name="x", extent=[12, 17], crs=4326, step=0.1),
+        SpatialDimension(name="y", extent=[41, 51], crs=4326, step=0.1),
+    ]
+    t1 = TemporalDimension(name="t", extent=["2024-01-01", "2024-10-01"])
+    b1 = BandDimension(name="bands", bands=[Band("B1"), Band("B11")])
+    metadata1 = CubeMetadata(dimensions=xy1 + [t1, b1])
+
+    xy2 = [
+        SpatialDimension(name="x", extent=[22, 27], crs=4326, step=0.1),
+        SpatialDimension(name="y", extent=[42, 52], crs=4326, step=0.1),
+    ]
+    t2 = TemporalDimension(name="t", extent=["2024-02-02", "2024-12-02"])
+    metadata2 = CubeMetadata(dimensions=xy2 + [t2])
+
+    xy3 = [
+        SpatialDimension(name="x", extent=[32, 37], crs=4326, step=0.1),
+        SpatialDimension(name="y", extent=[43, 53], crs=4326, step=0.1),
+    ]
+    b3 = BandDimension(name="bands", bands=[Band("B3"), Band("B33")])
+    metadata3 = CubeMetadata(dimensions=xy3 + [b3])
+
+    result12 = metadata1.resample_cube_spatial(target=metadata2)
+    assert result12.spatial_dimensions == xy2
+    assert result12.band_dimension == b1
+    assert result12.temporal_dimension == t1
+
+    result21 = metadata2.resample_cube_spatial(target=metadata1)
+    assert result21.spatial_dimensions == xy1
+    assert not result21.has_band_dimension()
+    assert result21.temporal_dimension == t2
+
+    result23 = metadata2.resample_cube_spatial(target=metadata3)
+    assert result23.spatial_dimensions == xy3
+    assert not result23.has_band_dimension()
+    assert result23.temporal_dimension == t2
+
+    result31 = metadata3.resample_cube_spatial(target=metadata1)
+    assert result31.spatial_dimensions == xy1
+    assert result31.band_dimension == b3
+    assert not result31.has_temporal_dimension()