Bug was with changes to rf_with_no_data acceptance of either Double or Int, and then incorrectly changing floating point tiles into a float cell type.

Fixes #304.

Author: metasim

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

@@ -57,7 +57,7 @@ case class SetCellType(tile: Expression, cellType: Expression)
   extends BinaryExpression with CodegenFallback {
   def left = tile
   def right = cellType
-  override def nodeName: String = "set_cell_type"
+  override def nodeName: String = "rf_convert_cell_type"
   override def dataType: DataType = left.dataType
 
   override def checkInputDataTypes(): TypeCheckResult = {

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

@@ -22,7 +22,6 @@
 package org.locationtech.rasterframes.expressions.transformers
 
 import com.typesafe.scalalogging.LazyLogging
-import geotrellis.raster.Tile
 import org.apache.spark.sql.Column
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
 import org.apache.spark.sql.catalyst.analysis.TypeCheckResult.{TypeCheckFailure, TypeCheckSuccess}
@@ -33,7 +32,7 @@ import org.apache.spark.sql.rf.TileUDT
 import org.apache.spark.sql.types._
 import org.locationtech.rasterframes.encoders.CatalystSerializer._
 import org.locationtech.rasterframes.expressions.DynamicExtractors._
-import org.locationtech.rasterframes.expressions.{fpTile, row}
+import org.locationtech.rasterframes.expressions.row
 
 @ExpressionDescription(
   usage = "_FUNC_(tile, value) - Set the NoData value for the given tile.",
@@ -64,20 +63,19 @@ case class SetNoDataValue(left: Expression, right: Expression) extends BinaryExp
   override protected def nullSafeEval(input1: Any, input2: Any): Any = {
     implicit val tileSer = TileUDT.tileSerializer
     val (leftTile, leftCtx) = tileExtractor(left.dataType)(row(input1))
+
     val result = numberArgExtractor(right.dataType)(input2) match {
-      case DoubleArg(d) => op(fpTile(leftTile), d)
-      case IntegerArg(i) => op(leftTile, i)
+      case DoubleArg(d) => leftTile.withNoData(Some(d))
+      case IntegerArg(i) => leftTile.withNoData(Some(i.toDouble))
     }
 
     leftCtx match {
       case Some(ctx) => ctx.toProjectRasterTile(result).toInternalRow
       case None => result.toInternalRow
     }
   }
-
-  protected def op(left: Tile, right: Double): Tile = left.withNoData(Some(right))
-  protected def op(left: Tile, right: Int): Tile = left.withNoData(Some(right))
 }
+
 object SetNoDataValue {
   def apply(left: Column, right: Column): Column =
     new Column(SetNoDataValue(left.expr, right.expr))

core/src/main/scala/org/locationtech/rasterframes/functions/package.scala

@@ -90,8 +90,6 @@ package object functions {
     }
   }
 
-
-
   /** Alias for constant tiles of zero */
   private[rasterframes] val tileZeros: (Int, Int, String) ⇒ Tile = (cols, rows, cellTypeName) ⇒
     makeConstantTile(0, cols, rows, cellTypeName)

core/src/test/scala/org/locationtech/rasterframes/RasterFunctionsSpec.scala

@@ -120,17 +120,20 @@ class RasterFunctionsSpec extends TestEnvironment with RasterMatchers {
     it("should change NoData value") {
       val df = Seq((TestData.injectND(7)(three), TestData.injectND(12)(two))).toDF("three", "two")
 
-      val ct = df.select(
+      val ndCT = df.select(
         rf_with_no_data($"three", 3) as "three",
-        rf_with_no_data($"two", 2) as "two"
+        rf_with_no_data($"two", 2.0) as "two"
       )
 
-      val (cnt3, cnt2) = ct.select(rf_no_data_cells($"three"), rf_no_data_cells($"two")).as[(Long, Long)].first()
+      val (cnt3, cnt2) = ndCT.select(rf_no_data_cells($"three"), rf_no_data_cells($"two")).as[(Long, Long)].first()
 
       cnt3 should be ((cols * rows) - 7)
       cnt2 should be ((cols * rows) - 12)
 
       checkDocs("rf_with_no_data")
+
+      // Should maintain original cell type.
+      ndCT.select(rf_cell_type($"two")).first().withDefaultNoData() should be(ct.withDefaultNoData())
     }
   }
 

pyrasterframes/src/main/python/pyrasterframes/rf_ipython.py

@@ -153,7 +153,7 @@ def _safe_tile_to_html(t):
     return return_html
 
 
-def spark_df_to_markdown(df, num_rows=5, truncate=True, vertical=False):
+def spark_df_to_markdown(df, num_rows=5, truncate=False, vertical=False):
     from pyrasterframes import RFContext
     return RFContext.active().call("_dfToMarkdown", df._jdf, num_rows, truncate)