fixup! Issue #114/#141 temporarily roll back automatic conversion of inline Point GeoJSON to VectorCube in aggregate_spatial

Author: soxofaan

openeo_driver/ProcessGraphDeserializer.py

@@ -1050,15 +1050,35 @@ def aggregate_spatial(args: dict, env: EvalEnv) -> DriverDataCube:
     if isinstance(geoms, DriverVectorCube):
         geoms = geoms
     elif isinstance(geoms, dict):
-        if geoms.get("type") == "Point":
-            # TODO #114 migrate Point handling to DriverVectorCube too
-            geoms = geojson_to_geometry(geoms)
-        elif geoms.get("type") == "GeometryCollection" and any(g.get("type") == "Point" for g in geoms.get("geometries", [])):
-            # TODO #114 migrate Point handling to DriverVectorCube too
-            geoms = geojson_to_geometry(geoms)
-        else:
-            # Automatically convert inline GeoJSON to a vector cube #114/#141
-            geoms = env.backend_implementation.vector_cube_cls.from_geojson(geoms)
+        try:
+            if (
+                # Don't convert point geometries to DriverVectorCube
+                # TODO #114 migrate Point handling to DriverVectorCube too
+                geoms["type"] == "Point"
+                or (geoms["type"] == "Feature" and geoms["geometry"]["type"] == "Point")
+                or (
+                    geoms["type"] == "FeatureCollection"
+                    and any(f["geometry"]["type"] == "Point" for f in geoms["features"])
+                )
+                or (
+                    geoms["type"] == "GeometryCollection"
+                    and any(g["type"] == "Point" for g in geoms["geometries"])
+                )
+            ):
+                geoms = geojson_to_geometry(geoms)
+            else:
+                # Automatically convert inline GeoJSON to a vector cube #114/#141
+                geoms = env.backend_implementation.vector_cube_cls.from_geojson(geoms)
+        except Exception as e:
+            _log.error(
+                f"Failed to parse inline GeoJSON geometries in aggregate_spatial: {e!r}",
+                exc_info=True,
+            )
+            raise ProcessParameterInvalidException(
+                parameter="geometries",
+                process="aggregate_spatial",
+                reason="Failed to parse inline GeoJSON",
+            )
     elif isinstance(geoms, DelayedVector):
         geoms = geoms.path
     else: