Merge pull request #538 from s22s/fix/531-xz2-lenient

Use lenient=true in Z2 and XZ2 indexers

Author: vpipkt

core/src/main/scala/org/locationtech/rasterframes/expressions/transformers/XZ2Indexer.scala

@@ -83,7 +83,7 @@ case class XZ2Indexer(left: Expression, right: Expression, indexResolution: Shor
 
     val index = indexer.index(
       env.getMinX, env.getMinY, env.getMaxX, env.getMaxY,
-      lenient = false
+      lenient = true
     )
     index
   }

core/src/main/scala/org/locationtech/rasterframes/expressions/transformers/Z2Indexer.scala

@@ -80,7 +80,7 @@ case class Z2Indexer(left: Expression, right: Expression, indexResolution: Short
       trans(coord)
     }
 
-    indexer.index(pt.getX, pt.getY, lenient = false).z
+    indexer.index(pt.getX, pt.getY, lenient = true).z
   }
 }
 

core/src/test/scala/org/locationtech/rasterframes/expressions/SFCIndexerSpec.scala

@@ -200,7 +200,7 @@ class SFCIndexerSpec extends TestEnvironment with Inspectors {
       val crs: CRS = LatLng
       withClue("XZ2") {
         val sfc = XZ2SFC(3)
-        val expected = testExtents.map(e => sfc.index(e.xmin, e.ymin, e.xmax, e.ymax))
+        val expected = testExtents.map(e => sfc.index(e.xmin, e.ymin, e.xmax, e.ymax, lenient = true))
         val indexes = df.select(rf_xz2_index($"extent", serialized_literal(crs), 3)).collect()
         forEvery(indexes.zip(expected)) { case (i, e) =>
           i should be(e)
@@ -215,5 +215,37 @@ class SFCIndexerSpec extends TestEnvironment with Inspectors {
         }
       }
     }
+    it("should be lenient from RasterSource") {
+      val extents = Seq(
+        Extent(-181, -91, -179.5, -89.5),
+        Extent(-181, 89.5, -179.5, 91),
+        Extent(179.5, -91, 181, -89.5),
+        Extent(179.5, 89.5, 181, 91)
+      )
+
+      val crs: CRS = LatLng
+      val tile = TestData.randomTile(2, 2, CellType.fromName("uint8"))
+      val srcs = extents
+        .map(InMemoryRasterSource(tile, _, crs): RFRasterSource)
+        .toDF("src")
+
+      withClue("XZ2") {
+        val expected = extents.map(e ⇒ xzsfc.index(e.xmin, e.ymin, e.xmax, e.ymax, lenient = true))
+        val indexes = srcs.select(rf_xz2_index($"src")).collect()
+        forEvery(indexes.zip(expected)) { case (i, e) =>
+          i should be(e)
+        }
+      }
+      withClue("Z2") {
+        val expected = extents.map({ e ⇒
+          val p = e.center
+          zsfc.index(p.x, p.y, lenient = true).z
+        })
+        val indexes = srcs.select(rf_z2_index($"src")).collect()
+        forEvery(indexes.zip(expected)) { case (i, e) =>
+          i should be(e)
+        }
+      }
+    }
   }
 }