Reenabled test (mostly) covered by 242.

Author: metasim

core/src/main/scala/org/locationtech/rasterframes/expressions/generators/RasterSourceToRasterRefs.scala

@@ -62,11 +62,10 @@ case class RasterSourceToRasterRefs(children: Seq[Expression], bandIndexes: Seq[
     try {
       val refs = children.map { child ⇒
         val src = RasterSourceType.deserialize(child.eval(input))
-        subtileDims.map(dims =>
-          src
-            .layoutExtents(dims)
-            .map(e ⇒ bandIndexes.map(band2ref(src, Some(e))))
-        )
+        subtileDims.map(dims => {
+          val extents = src.layoutExtents(dims)
+          extents.map(e ⇒ bandIndexes.map(band2ref(src, Some(e))))
+        })
         .getOrElse(Seq(bandIndexes.map(band2ref(src, None))))
       }
       refs.transpose.map(ts ⇒ InternalRow(ts.flatMap(_.map(_.toInternalRow)): _*))

core/src/test/scala/org/locationtech/rasterframes/ref/RasterSourceSpec.scala

@@ -26,7 +26,7 @@ import java.net.URI
 import org.locationtech.rasterframes._
 import geotrellis.vector.Extent
 import org.apache.spark.sql.rf.RasterSourceUDT
-import org.locationtech.rasterframes.model.TileDimensions
+import org.locationtech.rasterframes.model.{FixedRasterExtent, TileDimensions}
 
 
 class RasterSourceSpec extends TestEnvironment with TestData {
@@ -70,6 +70,21 @@ class RasterSourceSpec extends TestEnvironment with TestData {
         d._1 should be <= NOMINAL_TILE_SIZE
         d._2 should be <= NOMINAL_TILE_SIZE
       }
+
+      val re = FixedRasterExtent(
+        Extent(1.4455356755667E7, -3335851.5589995002, 1.55673072753335E7, -2223901.039333),
+        2400, 2400
+      )
+
+      val divisions = re.gridBounds
+        .split(256, 256)
+        .map { gb => gb -> re.rasterExtentFor(gb) }
+        .map { case (originalGB, t) => (originalGB, t.extent)  }
+        .map { case (originalGB, e) => (originalGB, re.gridBoundsFor(e, clamp = false)) }
+        .map { case (ogb, gb) => ((ogb.width, ogb.height), (gb.width, gb.height)) }
+        .toSeq
+        .distinct
+        divisions.length should be(4)
     }
   }
 

datasource/src/test/scala/org/locationtech/rasterframes/datasource/raster/RasterSourceDataSourceSpec.scala

@@ -248,7 +248,7 @@ class RasterSourceDataSourceSpec extends TestEnvironment with TestData {
 
   describe("RasterSource breaks up scenes into tiles") {
     val modis_df = spark.read.raster
-      .withTileDimensions(128, 128)
+      .withTileDimensions(256, 256)
       .withLazyTiles(true)
       .load(remoteMODIS.toASCIIString)
 
@@ -257,16 +257,16 @@ class RasterSourceDataSourceSpec extends TestEnvironment with TestData {
       .withLazyTiles(true)
       .load(remoteL8.toASCIIString)
 
-    ignore("should have at most four tile dimensions reading MODIS; ignore until fix #242") {
+    it("should have at most four tile dimensions reading MODIS") {
       val dims = modis_df.select(rf_dimensions($"proj_raster")).distinct().collect()
-      dims.length should be > (0)
-      dims.length should be <= (4)
+      dims.length should be > 0
+      dims.length should be <= 4
     }
 
     it("should have at most four tile dimensions reading landsat") {
       val dims = l8_df.select(rf_dimensions($"proj_raster")).distinct().collect()
-      dims.length should be > (0)
-      dims.length should be <= (4)
+      dims.length should be > 0
+      dims.length should be <= 4
     }
 
     it("should provide MODIS tiles with requested size") {
@@ -275,8 +275,8 @@ class RasterSourceDataSourceSpec extends TestEnvironment with TestData {
         .select($"dims".as[TileDimensions]).distinct().collect()
 
       forEvery(res) { r =>
-        r.cols should be <=128
-        r.rows should be <=128
+        r.cols should be <= 256
+        r.rows should be <= 256
       }
     }
 
@@ -286,8 +286,8 @@ class RasterSourceDataSourceSpec extends TestEnvironment with TestData {
         .select($"dims".as[TileDimensions]).distinct().collect()
 
       forEvery(dims) { d =>
-        d.cols should be <=32
-        d.rows should be <=33
+        d.cols should be <= 32
+        d.rows should be <= 33
       }
     }