Fix for when x and y are not the first 2 dimensions. Assert x,y order. #690

Author: EmileSonneveld

openeo/metadata.py

@@ -304,7 +304,12 @@ def temporal_dimension(self) -> TemporalDimension:
 
     @property
     def spatial_dimensions(self) -> List[SpatialDimension]:
-        return [d for d in self._dimensions if isinstance(d, SpatialDimension)]
+        lst = [d for d in self._dimensions if isinstance(d, SpatialDimension)]
+        if lst:
+            assert len(lst) == 2
+            assert lst[0].name == "x"
+            assert lst[1].name == "y"
+        return lst
 
     def has_geometry_dimension(self):
         return any(isinstance(d, GeometryDimension) for d in self._dimensions)
@@ -442,11 +447,13 @@ def resample_spatial(
             raise MetadataException(f"Expected two spatial resolutions but found {spatial_indixes=}")
         for i in spatial_indixes:
             dim: SpatialDimension = dimensions[i]
+            assert dim.name in ["x", "y"]
+            resolution_i = 0 if dim.name == "x" else 1
             dimensions[i] = SpatialDimension(
                 name=dim.name,
                 extent=dim.extent,
                 crs=projection or dim.crs,
-                step=resolution[i] if resolution[i] else dim.step,
+                step=resolution[resolution_i] if resolution[resolution_i] else dim.step,
             )
 
         return self._clone_and_update(dimensions=dimensions)

openeo/utils/normalize.py

@@ -5,6 +5,7 @@ def normalize_resample_resolution(
     resolution: Union[int, float, Tuple[float, float], Tuple[int, int]]
 ) -> Tuple[Union[int, float], Union[int, float]]:
     """Normalize a resolution value, as used in the `resample_spatial` process to a two-element tuple."""
+    # This is a stricter version than clean_number_pair()
     if isinstance(resolution, (int, float)):
         return (resolution, resolution)
     elif (