EP-3251 fix DataCube.mask

Open-EO · Mar 10, 2020 · 91205c2 · 91205c2
1 parent a6d0908
commit 91205c2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/openeo/rest/datacube.py b/openeo/rest/datacube.py
@@ -761,6 +761,7 @@ def mask(self, polygon: Union[Polygon, MultiPolygon, str] = None, srs="EPSG:4326
         No data values will be left untouched by the masking operation.
 
         # TODO: just provide a single `mask` argument and detect the type: polygon or process graph
+        # TODO: mask process has been split in mask/mask_polygon
         # TODO: also see `mask` vs `mask_polygon` processes in https://github.com/Open-EO/openeo-processes/pull/110
 
         :param polygon: A polygon, provided as a :class:`shapely.geometry.Polygon` or :class:`shapely.geometry.MultiPolygon`, or a filename pointing to a valid vector file
@@ -781,7 +782,7 @@ def mask(self, polygon: Union[Polygon, MultiPolygon, str] = None, srs="EPSG:4326
                 })
 
                 mask = {
-                    'from_node': new_collection.node_id
+                    'from_node': new_collection.builder.result_node
                 }
             else:
                 if polygon.area == 0:

diff --git a/tests/rest/test_datacube.py b/tests/rest/test_datacube.py
@@ -1,6 +1,7 @@
-import openeo
 import pytest
-from openeo.internal.graphbuilder import GraphBuilder
+import shapely.geometry
+
+import openeo
 from openeo.rest.connection import Connection
 
 API_URL = "https://oeo.net"
@@ -28,6 +29,42 @@ def con100(requests_mock) -> Connection:
     return openeo.connect(API_URL)
 
 
+def test_mask_polygon(con100: Connection):
+    img = con100.load_collection("S2")
+    polygon = shapely.geometry.box(0, 0, 1, 1)
+    masked = img.mask(polygon=polygon)
+    assert sorted(masked.graph.keys()) == ["loadcollection1", "mask1"]
+    assert masked.graph["mask1"] == {
+        "process_id": "mask",
+        "arguments": {
+            "data": {"from_node": "loadcollection1"},
+            'mask': {
+                'coordinates': (((1.0, 0.0), (1.0, 1.0), (0.0, 1.0), (0.0, 0.0), (1.0, 0.0)),),
+                'crs': {'properties': {'name': 'EPSG:4326'}, 'type': 'name'},
+                'type': 'Polygon'}
+        },
+        "result": True
+    }
+
+
+def test_mask_polygon_path(con100: Connection):
+    img = con100.load_collection("S2")
+    masked = img.mask(polygon="path/to/polygon.json")
+    assert sorted(masked.graph.keys()) == ["loadcollection1", "mask1", "readvector1"]
+    assert masked.graph["mask1"] == {
+        "process_id": "mask",
+        "arguments": {
+            "data": {"from_node": "loadcollection1"},
+            "mask": {"from_node": "readvector1"},
+        },
+        "result": True
+    }
+    assert masked.graph["readvector1"] == {
+        "process_id": "read_vector",
+        "arguments": {"filename": "path/to/polygon.json"},
+    }
+
+
 def test_mask_raster(con100: Connection):
     img = con100.load_collection("S2")
     mask = con100.load_collection("MASK")