Issue #392 array_contains support (fixed tests)

Author: dsamaey

openeo-geotrellis/src/main/scala/org/openeo/geotrellis/OpenEOProcessScriptBuilder.scala

@@ -672,7 +672,6 @@ class OpenEOProcessScriptBuilder {
     val reverse = (arguments.getOrDefault("reverse",Boolean.box(false).asInstanceOf[Object]) == Boolean.box(true) || arguments.getOrDefault("reverse",None) == "true" )
     resultingDataType = ShortConstantNoDataCellType
 
-
     val arrayfindProcess = (context: Map[String, Any]) => (tiles: Seq[Tile]) => {
       val value_input: Seq[Tile] = evaluateToTiles(value, context, tiles)
       val data_input: Seq[Tile] = evaluateToTiles(data, context, tiles)

openeo-geotrellis/src/main/scala/org/openeo/geotrellis/package.scala

@@ -27,7 +27,6 @@ import java.time.temporal.ChronoUnit
 import java.time.{Duration, Instant}
 import java.util.concurrent.ConcurrentHashMap
 import scala.compat.java8.FunctionConverters._
-import scala.reflect.io.Directory
 
 
 package object geotrellis {

openeo-geotrellis/src/test/java/org/openeo/geotrellis/TestOpenEOProcessScriptBuilder.java

@@ -1257,6 +1257,7 @@ public void testArrayContains() {
 
         Tile result = transformation.apply(JavaConverters.asScalaBuffer(Arrays.asList(tile0, tile1, tile2, tile3))).head();
         BitArrayTile expectedResult = BitArrayTile.fromBytes(new byte[]{(byte)153, (byte)153}, 4, 4);
+        System.out.println(transformation);
         assertTileEquals(expectedResult, result);
     }
 

openeo-geotrellis/src/test/resources/org/openeo/geotrellis/testArrayContainsProcessGraph.json

@@ -0,0 +1,12 @@
+{
+  "contains": {
+    "process_id": "array_contains",
+    "arguments": {
+      "data": {
+        "from_parameter": "data"
+      },
+      "value": 5
+    },
+    "result": true
+  }
+}

openeo-geotrellis/src/test/resources/org/openeo/geotrellis/testArrayFindProcessGraph.json

@@ -0,0 +1,12 @@
+{
+  "find": {
+    "process_id": "array_find",
+    "arguments": {
+      "data": {
+        "from_parameter": "data"
+      },
+      "value": 5
+    },
+    "result": true
+  }
+}

openeo-geotrellis/src/test/scala/org/openeo/geotrellis/OpenEOProcessGraphBuilderTest.scala

@@ -3,11 +3,14 @@ package org.openeo.geotrellis
 import org.apache.commons.io.IOUtils
 import org.junit.Test
 import com.fasterxml.jackson.databind.ObjectMapper
-import geotrellis.raster.{ByteArrayTile, ByteConstantNoDataCellType, ShortArrayTile, Tile}
-import org.junit.jupiter.api.Assertions.{assertEquals, assertNotNull}
+import geotrellis.raster.{BitArrayTile, ByteArrayFiller, ByteArrayTile, ByteConstantNoDataArrayTile, ByteConstantNoDataCellType, ShortArrayTile, ShortConstantNoDataCellType, ShortConstantNoDataCellType$, Tile}
+import org.junit.jupiter.api.Assertions.{assertArrayEquals, assertEquals, assertNotNull}
 
+import java.net.URL
 import java.nio.charset.Charset
 import java.util
+import java.util.Arrays
+import scala.collection.JavaConverters
 import scala.collection.mutable.ArrayBuffer
 
 class OpenEOProcessGraphBuilderTest {
@@ -69,11 +72,10 @@ class OpenEOProcessGraphBuilderTest {
   }
 
   def assertTileEquals(expected: Tile, actual: Tile):Unit = {
-    assertEquals(1,1)
     assertEquals(expected.cols, actual.cols)
     assertEquals(expected.rows, actual.rows)
     assertEquals(expected.cellType, actual.cellType)
-    assert(expected.toArray sameElements  actual.toArray)
+    assertArrayEquals(expected.toArray, actual.toArray)
   }
 
   def fillShortArrayTile(cols: Int, rows: Int, values: Int *)= {
@@ -105,31 +107,22 @@ class OpenEOProcessGraphBuilderTest {
 
   @Test
   def testArrayFind(): Unit = {
-    val graphPath = IOUtils.toString(getClass.getResource("/org/openeo/geotrellis/testArrayFindProcessGraph.json"), Charset.defaultCharset())
-    val visitor = (new GeotrellisTileProcessGraphVisitor).create()
-    val graph = new ObjectMapper().readValue(graphPath,classOf[util.Map[String,Object]])
-    println(graph)
-    visitor._acceptDict(graph)
-    //    val processes = visitor.processes
-    //    assert(processes.size==4)
-    //    for (process <- processes) {
-    //      print(process)
-    //    }
+    val transformation = org.openeo.geotrellis.testutil.fromUrl(getClass.getResource("/org/openeo/geotrellis/testArrayFindProcessGraph.json"))
+    val tile0 = ByteArrayTile.fill(10.toByte, 4, 4)
+    val tile1 = ByteArrayTile.fill(5.toByte, 4, 4)
+    val result = transformation.apply(JavaConverters.asScalaBuffer(util.Arrays.asList(tile0, tile1)))
+    val expectedResult = ByteArrayTile.fill(1.toByte, 4, 4)
+    assertTileEquals(expectedResult.convert(ShortConstantNoDataCellType), result.head)
   }
 
-
   @Test
   def testArrayContains(): Unit = {
-    val graphPath = IOUtils.toString(getClass.getResource("/org/openeo/geotrellis/testArrayContainsProcessGraph.json"), Charset.defaultCharset())
-    val visitor = (new GeotrellisTileProcessGraphVisitor).create()
-    val graph = new ObjectMapper().readValue(graphPath,classOf[util.Map[String,Object]])
-    println(graph)
-    visitor.acceptProcessGraph(graph)
-//    val processes = visitor.processes
-//    assert(processes.size==4)
-//    for (process <- processes) {
-//      print(process)
-//    }
+    val transformation = org.openeo.geotrellis.testutil.fromUrl(getClass.getResource("/org/openeo/geotrellis/testArrayContainsProcessGraph.json"))
+    val tile0 = ByteArrayTile.fill(10.toByte, 4, 4)
+    val tile1 = ByteArrayTile.fill(5.toByte, 4, 4)
+    val result = transformation.apply(JavaConverters.asScalaBuffer(util.Arrays.asList(tile0, tile1)))
+    val expectedResult = new BitArrayTile(Array.ofDim[Byte](((4 * 4) + 7) / 8).fill(255.toByte), 4, 4) // BitArrayTile.fill(1, 4, 4) seems bugged
+    assertTileEquals(expectedResult, result.head)
   }
 
 
@@ -148,4 +141,4 @@ class OpenEOProcessGraphBuilderTest {
     assert(true)
   }
 
-}
+}

openeo-geotrellis/src/test/scala/org/openeo/geotrellis/testutil/package.scala

@@ -0,0 +1,26 @@
+package org.openeo.geotrellis
+
+import _root_.geotrellis.raster._
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.apache.commons.io.IOUtils
+
+import java.net.URL
+import java.nio.charset.Charset
+import java.util
+
+
+package object testutil {
+
+  def fromUrl(url: URL): Seq[Tile] => Seq[Tile] = {
+    val graphPath = IOUtils.toString(url, Charset.defaultCharset())
+    fromString(graphPath)
+  }
+
+  def fromString(graphPath: String): Seq[Tile] => Seq[Tile] = {
+    val visitor = (new GeotrellisTileProcessGraphVisitor).create()
+    val graph = new ObjectMapper().readValue(graphPath, classOf[util.Map[String, Object]])
+    visitor.acceptProcessGraph(graph)
+    val transformation = visitor.builder.generateFunction()
+    transformation
+  }
+}