Fixed regressions.

Author: metasim

core/src/test/scala/org/locationtech/rasterframes/functions/AggregateFunctionsSpec.scala

@@ -114,9 +114,10 @@ class AggregateFunctionsSpec extends TestEnvironment with RasterMatchers {
         .toDF("tile")
         .withColumn("id", monotonically_increasing_id())
 
-      df.select(rf_agg_local_mean($"tile")).first() should be(three.toArrayTile())
+      val expected = three.toArrayTile().convert(DoubleConstantNoDataCellType)
+      df.select(rf_agg_local_mean($"tile")).first() should be(expected)
 
-      df.selectExpr("rf_agg_local_mean(tile)").as[Tile].first() should be(three.toArrayTile())
+      df.selectExpr("rf_agg_local_mean(tile)").as[Tile].first() should be(expected)
 
       noException should be thrownBy {
         df.groupBy($"id")
@@ -139,7 +140,8 @@ class AggregateFunctionsSpec extends TestEnvironment with RasterMatchers {
       val t2 = df.selectExpr("rf_agg_local_no_data_cells(tile) as cnt").select($"cnt".as[Tile]).first()
       t1 should be(t2)
       val t3 = df.select(rf_local_add(rf_agg_local_data_cells($"tile"), rf_agg_local_no_data_cells($"tile"))).as[Tile].first()
-      t3 should be(three.toArrayTile())
+      val expected = three.toArrayTile().convert(IntConstantNoDataCellType)
+      t3 should be(expected)
       checkDocs("rf_agg_local_no_data_cells")
     }
   }

…/functions/ArithmeticFunctionsSpec.scala …rames/functions/LocalFunctionsSpec.scalacore/src/test/scala/org/locationtech/rasterframes/functions/ArithmeticFunctionsSpec.scala renamed to core/src/test/scala/org/locationtech/rasterframes/functions/LocalFunctionsSpec.scala core/src/test/scala/org/locationtech/rasterframes/functions/ArithmeticFunctionsSpec.scala renamed to core/src/test/scala/org/locationtech/rasterframes/functions/LocalFunctionsSpec.scala

@@ -29,7 +29,7 @@ import org.apache.spark.sql.functions._
 import org.locationtech.rasterframes.expressions.accessors.ExtractTile
 import org.locationtech.rasterframes.tiles.ProjectedRasterTile
 import org.locationtech.rasterframes._
-class ArithmeticFunctionsSpec extends TestEnvironment with RasterMatchers {
+class LocalFunctionsSpec extends TestEnvironment with RasterMatchers {
 
   import TestData._
   import spark.implicits._

core/src/test/scala/org/locationtech/rasterframes/functions/TileFunctionsSpec.scala

@@ -29,6 +29,7 @@ import javax.imageio.ImageIO
 import org.apache.spark.sql.Encoders
 import org.apache.spark.sql.functions.sum
 import org.locationtech.rasterframes._
+import org.locationtech.rasterframes.ref.RasterRef
 import org.locationtech.rasterframes.tiles.ProjectedRasterTile
 import org.locationtech.rasterframes.util.ColorRampNames
 
@@ -235,14 +236,15 @@ class TileFunctionsSpec extends TestEnvironment with RasterMatchers {
       g should be(extent.toPolygon())
       checkDocs("rf_geometry")
     }
+    implicit val enc = Encoders.tuple(Encoders.scalaInt, RasterRef.rrEncoder)
 
     it("should get the CRS of a RasterRef") {
-      val e = Seq(Tuple1(TestData.rasterRef)).toDF("ref").select(rf_crs($"ref")).first()
+      val e = Seq((1, TestData.rasterRef)).toDF("index", "ref").select(rf_crs($"ref")).first()
       e should be(rasterRef.crs)
     }
 
     it("should get the Extent of a RasterRef") {
-      val e = Seq(Tuple1(rasterRef)).toDF("ref").select(rf_extent($"ref")).first()
+      val e = Seq((1, rasterRef)).toDF("index", "ref").select(rf_extent($"ref")).first()
       e should be(rasterRef.extent)
     }
   }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.4
+sbt.version=1.3.7