Also support openeo.api.process.Parameter objects for the projection argument of resample_spatial #897

Author: VincentVerelst

CHANGELOG.md

@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 ### Fixed
-- `DataCube.resample_spatial()` now supports `openeo.api.process.Parameter` objects for the `resolution` parameter.  ([#897](https://github.com/Open-EO/openeo-python-client/issues/897))
+- `DataCube.resample_spatial()` now supports `openeo.api.process.Parameter` objects for the `resolution` and `projection` parameter.  ([#897](https://github.com/Open-EO/openeo-python-client/issues/897))
 
 ## [0.49.0] - 2026-04-01
 

openeo/metadata.py

@@ -495,13 +495,14 @@ def drop_dimension(self, name: str = None) -> CubeMetadata:
 
     def resample_spatial(
         self,
-        resolution: Union[float, Tuple[float, float], List[float], "Parameter"] = 0.0,
-        projection: Union[int, str, None] = None,
+        resolution: Union[float, Tuple[float, float], List[float], Parameter] = 0.0,
+        projection: Union[int, str, Parameter, None] = None,
     ) -> CubeMetadata:
         if isinstance(resolution, Parameter):
-            normalized_resolution = None
+            normalized_resolution = None, None
         else:
             normalized_resolution = normalize_resample_resolution(resolution)
+
         if self._dimensions is None:
             # Best-effort fallback to work with
             dimensions = [
@@ -516,25 +517,16 @@ def resample_spatial(
         spatial_indices = [i for i, d in enumerate(dimensions) if isinstance(d, SpatialDimension)]
         if len(spatial_indices) != 2:
             raise MetadataException(f"Expected two spatial dimensions but found {spatial_indices=}")
-        if normalized_resolution is not None:
-            assert len(normalized_resolution) == 2
-            for i, r in zip(spatial_indices, normalized_resolution):
-                dim: SpatialDimension = dimensions[i]
-                dimensions[i] = SpatialDimension(
-                    name=dim.name,
-                    extent=dim.extent,
-                    crs=projection or dim.crs,
-                    step=r if r != 0.0 else dim.step,
-                )
-        elif projection:
-            for i in spatial_indices:
-                dim: SpatialDimension = dimensions[i]
-                dimensions[i] = SpatialDimension(
-                    name=dim.name,
-                    extent=dim.extent,
-                    crs=projection,
-                    step=dim.step,
-                )
+
+        assert len(normalized_resolution) == 2
+        for i, r in zip(spatial_indices, normalized_resolution):
+            dim: SpatialDimension = dimensions[i]
+            dimensions[i] = SpatialDimension(
+                name=dim.name,
+                extent=dim.extent,
+                crs=None if isinstance(projection, Parameter) else projection or dim.crs,
+                step=r if r != 0.0 else dim.step,
+            )
 
         return self._clone_and_update(dimensions=dimensions)
 

openeo/rest/datacube.py

@@ -810,7 +810,7 @@ def band(self, band: Union[str, int]) -> DataCube:
     def resample_spatial(
         self,
         resolution: Union[float, Tuple[float, float], List[float], Parameter] = 0.0,
-        projection: Union[int, str, None] = None,
+        projection: Union[int, str, Parameter, None] = None,
         method: str = "near",
         align: str = "upper-left",
     ) -> DataCube:

tests/rest/datacube/test_datacube.py

@@ -913,6 +913,51 @@ def test_resample_spatial_parameter_resolution_no_projection(s2cube):
     }
 
 
+def test_resample_spatial_parameter_projection(s2cube):
+    """A Parameter object passed as projection must appear in the process graph; metadata crs should be None."""
+    proj_param = Parameter.integer("proj", description="The target projection.")
+    cube = s2cube.resample_spatial(resolution=10, projection=proj_param)
+    assert get_download_graph(cube, drop_load_collection=True, drop_save_result=True) == {
+        "resamplespatial1": {
+            "process_id": "resample_spatial",
+            "arguments": {
+                "data": {"from_node": "loadcollection1"},
+                "resolution": 10,
+                "projection": {"from_parameter": "proj"},
+                "method": "near",
+                "align": "upper-left",
+            },
+        }
+    }
+    assert cube.metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=None, crs=None, step=10),
+        SpatialDimension(name="y", extent=None, crs=None, step=10),
+    ]
+
+
+def test_resample_spatial_parameter_resolution_and_projection(s2cube):
+    """When both resolution and projection are Parameters, step and crs should both be None."""
+    res_param = Parameter.number("res", description="The spatial resolution.")
+    proj_param = Parameter.integer("proj", description="The target projection.")
+    cube = s2cube.resample_spatial(resolution=res_param, projection=proj_param)
+    assert get_download_graph(cube, drop_load_collection=True, drop_save_result=True) == {
+        "resamplespatial1": {
+            "process_id": "resample_spatial",
+            "arguments": {
+                "data": {"from_node": "loadcollection1"},
+                "resolution": {"from_parameter": "res"},
+                "projection": {"from_parameter": "proj"},
+                "method": "near",
+                "align": "upper-left",
+            },
+        }
+    }
+    assert cube.metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=None, crs=None, step=None),
+        SpatialDimension(name="y", extent=None, crs=None, step=None),
+    ]
+
+
 def test_resample_cube_spatial(s2cube):
     cube1 = s2cube.resample_spatial(resolution=[2.0, 3.0], projection=4578)
     cube2 = s2cube.resample_spatial(resolution=10, projection=32631)

tests/test_metadata.py

@@ -1286,10 +1286,10 @@ def test_metadata_resample_spatial_parameter_resolution_only(cube_metadata):
     param = Parameter.number("res", description="The spatial resolution.")
     metadata = cube_metadata.resample_spatial(resolution=param)
     assert isinstance(metadata, CubeMetadata)
-    # step must not change because the resolution is unknown at build time
+    # step must be set to None after parametrized resample_spatial.
     assert metadata.spatial_dimensions == [
-        SpatialDimension(name="x", extent=[2, 7], crs=4326, step=0.1),
-        SpatialDimension(name="y", extent=[49, 52], crs=4326, step=0.1),
+        SpatialDimension(name="x", extent=[2, 7], crs=4326, step=None),
+        SpatialDimension(name="y", extent=[49, 52], crs=4326, step=None),
     ]
     assert metadata.temporal_dimension == cube_metadata.temporal_dimension
     assert metadata.band_dimension == cube_metadata.band_dimension
@@ -1302,8 +1302,37 @@ def test_metadata_resample_spatial_parameter_resolution_with_projection(cube_met
     metadata = cube_metadata.resample_spatial(resolution=param, projection=32631)
     assert isinstance(metadata, CubeMetadata)
     assert metadata.spatial_dimensions == [
-        SpatialDimension(name="x", extent=[2, 7], crs=32631, step=0.1),
-        SpatialDimension(name="y", extent=[49, 52], crs=32631, step=0.1),
+        SpatialDimension(name="x", extent=[2, 7], crs=32631, step=None),
+        SpatialDimension(name="y", extent=[49, 52], crs=32631, step=None),
+    ]
+    assert metadata.temporal_dimension == cube_metadata.temporal_dimension
+    assert metadata.band_dimension == cube_metadata.band_dimension
+
+
+@pytest.mark.parametrize("cube_metadata", [CUBE_METADATA_XYTB, CUBE_METADATA_TBXY])
+def test_metadata_resample_spatial_parameter_projection_only(cube_metadata):
+    """When projection is a Parameter, crs should be set to None."""
+    param = Parameter.integer("proj", description="The target projection.")
+    metadata = cube_metadata.resample_spatial(resolution=10, projection=param)
+    assert isinstance(metadata, CubeMetadata)
+    assert metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=[2, 7], crs=None, step=10),
+        SpatialDimension(name="y", extent=[49, 52], crs=None, step=10),
+    ]
+    assert metadata.temporal_dimension == cube_metadata.temporal_dimension
+    assert metadata.band_dimension == cube_metadata.band_dimension
+
+
+@pytest.mark.parametrize("cube_metadata", [CUBE_METADATA_XYTB, CUBE_METADATA_TBXY])
+def test_metadata_resample_spatial_parameter_resolution_and_projection(cube_metadata):
+    """When both resolution and projection are Parameters, step and crs should both be None."""
+    res_param = Parameter.number("res", description="The spatial resolution.")
+    proj_param = Parameter.integer("proj", description="The target projection.")
+    metadata = cube_metadata.resample_spatial(resolution=res_param, projection=proj_param)
+    assert isinstance(metadata, CubeMetadata)
+    assert metadata.spatial_dimensions == [
+        SpatialDimension(name="x", extent=[2, 7], crs=None, step=None),
+        SpatialDimension(name="y", extent=[49, 52], crs=None, step=None),
     ]
     assert metadata.temporal_dimension == cube_metadata.temporal_dimension
     assert metadata.band_dimension == cube_metadata.band_dimension