assert that both "id" and "properties.id" are considered

Open-EO/openeo-geotrellis-extensions#74
Open-EO · Sep 20, 2022 · 2d0b27e · 2d0b27e
1 parent b2b888c
commit 2d0b27e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/openeo_driver/datacube.py b/openeo_driver/datacube.py
@@ -184,6 +184,7 @@ def from_fiona(cls, paths: List[str], driver: str, options: dict) -> "DriverVect
             # TODO #114 EP-3981: support multiple paths
             raise FeatureUnsupportedException(message="Loading a vector cube from multiple files is not supported")
         # TODO #114 EP-3981: lazy loading like/with DelayedVector
+        # note for GeoJSON: will consider Feature.id as well as Feature.properties.id
         return cls(geometries=gpd.read_file(paths[0], driver=driver))
 
     @classmethod

diff --git a/tests/data/geojson/FeatureCollection05.json b/tests/data/geojson/FeatureCollection05.json
@@ -0,0 +1,41 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": "first",
+      "properties": {
+        "pop": 1234
+      },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [1, 1],
+            [3, 1],
+            [2, 3],
+            [1, 1]
+          ]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "id": "second",
+      "properties": {
+        "pop": 5678
+      },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [4, 2],
+            [5, 4],
+            [3, 4],
+            [4, 2]
+          ]
+        ]
+      }
+    }
+  ]
+}
diff --git a/tests/test_views_execute.py b/tests/test_views_execute.py
@@ -751,8 +751,12 @@ def test_aggregate_spatial_invalid_geometry(api100, geometries, expected):
     _ = api100.result(pg).assert_error(400, "ProcessParameterInvalid", expected)
 
 
-def test_aggregate_spatial_vector_cube_basic(api100):
-    path = get_path("geojson/FeatureCollection02.json")
+@pytest.mark.parametrize(["feature_collection_test_path"], [
+    ["geojson/FeatureCollection02.json"],
+    ["geojson/FeatureCollection05.json"]
+])
+def test_aggregate_spatial_vector_cube_basic(api100, feature_collection_test_path):
+    path = get_path(feature_collection_test_path)
     pg = {
         "lc": {"process_id": "load_collection", "arguments": {"id": "S2_FOOBAR", "bands": ["B02", "B03", "B04"]}},
         "lf": {