From 7209e97ab378cba334e5f5dcabc6b5d9c684f970 Mon Sep 17 00:00:00 2001 From: JeroenVerstraelen Date: Wed, 27 Mar 2024 21:24:32 +0100 Subject: [PATCH] Issue #276 fix dry run of aggregate_spatial --- openeo_driver/dry_run.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openeo_driver/dry_run.py b/openeo_driver/dry_run.py index 0bc753d8..cfdcd5ef 100644 --- a/openeo_driver/dry_run.py +++ b/openeo_driver/dry_run.py @@ -544,19 +544,18 @@ def mask_polygon(self, mask, replacement=None, inside: bool = False) -> 'DriverD return cube._process(operation="mask_polygon", arguments={"mask": mask}) def aggregate_spatial( - self, - geometries: Union[BaseGeometry, str, DriverVectorCube], - reducer: dict, - target_dimension: str = "result", - ) -> Union[AggregatePolygonResult, AggregatePolygonSpatialResult]: + self, + geometries: Union[BaseGeometry, str, DriverVectorCube], + reducer: dict, + target_dimension: str = "result", + ) -> "DryRunDataCube": # TODO #71 #114 EP-3981 normalize to vector cube instead of GeometryCollection geoms_is_empty = isinstance(geometries, DriverVectorCube) and len(geometries.get_geometries()) == 0 cube = self if not geoms_is_empty: geometries, bbox = self._normalize_geometry(geometries) cube = self.filter_bbox(**bbox, operation="_weak_spatial_extent") - cube._process(operation="aggregate_spatial", arguments={"geometries": geometries}) - return cube + return cube._process(operation="aggregate_spatial", arguments={"geometries": geometries}) def _normalize_geometry(self, geometries) -> Tuple[Union[DriverVectorCube, DelayedVector, BaseGeometry], dict]: """