EP-3981 #114 add to_vector_cube process (custom) for converting Geo…

…Json to VectorCube
Open-EO · Apr 22, 2022 · 927a115 · 927a115
1 parent ec74ca3
commit 927a115
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 0 deletions.
diff --git a/openeo_driver/ProcessGraphDeserializer.py b/openeo_driver/ProcessGraphDeserializer.py
@@ -946,6 +946,7 @@ def aggregate_polygon(args: dict, env: EvalEnv) -> DriverDataCube:
 def aggregate_spatial(args: dict, env: EvalEnv) -> DriverDataCube:
     reduce_pg = extract_deep(args, "reducer", "process_graph")
     cube = extract_arg(args, 'data')
+    # TODO: drop `target_dimension`? see https://github.com/Open-EO/openeo-processes/issues/366
     target_dimension = args.get('target_dimension', None)
 
     geoms = extract_arg(args, 'geometries')
@@ -1364,6 +1365,23 @@ def load_uploaded_files(args: dict, env: EvalEnv) -> DriverVectorCube:
         raise FeatureUnsupportedException(f"Loading format {format!r} is not supported")
 
 
+@non_standard_process(
+    ProcessSpec(
+        id="to_vector_cube",
+        description="[EXPERIMENTAL:] Converts given data (e.g. GeoJson object) to a vector cube."
+    )
+    .param('data', description="GeoJson object.", schema={"type": "object", "subtype": "geojson"})
+    .returns("vector-cube", schema={"type": "object", "subtype": "vector-cube"})
+)
+def to_vector_cube(args: Dict, env: EvalEnv):
+    # TODO: standardization of something like this? https://github.com/Open-EO/openeo-processes/issues/346
+    data = extract_arg(args, "data", process_id="to_vector_cube")
+    if isinstance(data, dict) and data.get("type") in {"Polygon", "MultiPolygon", "Feature", "FeatureCollection"}:
+        return DriverVectorCube.from_geojson(data)
+    # TODO: support more inputs: string with geojson, string with WKT, list of WKT, string with URL to GeoJSON, ...
+    raise FeatureUnsupportedException(f"Converting {type(data)} to vector cube is not supported")
+
+
 @non_standard_process(
     ProcessSpec("get_geometries", description="Reads vector data from a file or a URL or get geometries from a FeatureCollection")
         .param('filename', description="filename or http url of a vector file", schema={"type": "string"}, required=False)

diff --git a/openeo_driver/datacube.py b/openeo_driver/datacube.py
@@ -112,6 +112,7 @@ def aggregate_spatial(
             reducer: dict,
             target_dimension: str = "result",
     ) -> Union["AggregatePolygonResult", "AggregatePolygonSpatialResult", "DriverVectorCube"]:
+        # TODO: drop `target_dimension`? see https://github.com/Open-EO/openeo-processes/issues/366
         self._not_implemented()
 
 

diff --git a/tests/test_views_execute.py b/tests/test_views_execute.py
@@ -2582,3 +2582,81 @@ def test_if_merge_cubes(api100):
             "result": True
         }
     })
+
+
+@pytest.mark.parametrize(["geojson", "expected"], [
+    (
+            {"type": "Polygon", "coordinates": [[(1, 1), (3, 1), (2, 3), (1, 1)]]},
+            [
+                {
+                    "type": "Feature",
+                    "geometry": {"type": "Polygon", "coordinates": [[[1, 1], [3, 1], [2, 3], [1, 1]]]},
+                    "properties": {},
+                },
+            ],
+    ),
+    (
+            {"type": "MultiPolygon", "coordinates": [[[(1, 1), (3, 1), (2, 3), (1, 1)]]]},
+            [
+                {
+                    "type": "Feature",
+                    "geometry": {"type": "MultiPolygon", "coordinates": [[[[1, 1], [3, 1], [2, 3], [1, 1]]]]},
+                    "properties": {},
+                },
+            ],
+    ),
+    (
+            {
+                "type": "Feature",
+                "geometry": {"type": "MultiPolygon", "coordinates": [[[(1, 1), (3, 1), (2, 3), (1, 1)]]]},
+                "properties": {"id": "12_3"},
+            },
+            [
+                {
+                    "type": "Feature",
+                    "geometry": {"type": "MultiPolygon", "coordinates": [[[[1, 1], [3, 1], [2, 3], [1, 1]]]]},
+                    "properties": {"id": "12_3"},
+                },
+            ],
+    ),
+    (
+            {
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "geometry": {"type": "Polygon", "coordinates": [[(1, 1), (3, 1), (2, 3), (1, 1)]]},
+                        "properties": {"id": 1},
+                    },
+                    {
+                        "type": "Feature",
+                        "geometry": {"type": "MultiPolygon", "coordinates": [[[(1, 1), (3, 1), (2, 3), (1, 1)]]]},
+                        "properties": {"id": 2},
+                    },
+                ]},
+            [
+                {
+                    "type": "Feature",
+                    "geometry": {"type": "Polygon", "coordinates": [[[1, 1], [3, 1], [2, 3], [1, 1]]]},
+                    "properties": {"id": 1},
+                },
+                {
+                    "type": "Feature",
+                    "geometry": {"type": "MultiPolygon", "coordinates": [[[[1, 1], [3, 1], [2, 3], [1, 1]]]]},
+                    "properties": {"id": 2},
+                },
+            ],
+    ),
+])
+def test_to_vector_cube(api100, geojson, expected):
+    res = api100.check_result({
+        "vc": {
+            "process_id": "to_vector_cube",
+            "arguments": {"data": geojson},
+            "result": True,
+        }
+    })
+    assert res.json == DictSubSet({
+        "type": "FeatureCollection",
+        "features": expected,
+    })