Merge pull request #406 from s22s/fix/405

Ensure default tile size is applied to `raster` reader.

Author: metasim

core/src/main/scala/org/locationtech/rasterframes/expressions/aggregates/TileRasterizerAggregate.scala

@@ -138,7 +138,7 @@ object TileRasterizerAggregate {
       }
     }
 
-    // Scan table and constuct what the TileLayerMetadata would be in the specified destination CRS.
+    // Scan table and construct what the TileLayerMetadata would be in the specified destination CRS.
     val tlm: TileLayerMetadata[SpatialKey] = df
       .select(
         ProjectedLayerMetadataAggregate(

core/src/test/resources/MCD43A4.A2019111.h30v06.006.2019120033434_01.mrf.aux.xml

@@ -49,6 +49,7 @@ class GeoTiffDataSource
 
   def shortName() = GeoTiffDataSource.SHORT_NAME
 
+  /** Read single geotiff as a relation. */
   def createRelation(sqlContext: SQLContext, parameters: Map[String, String]) = {
     require(parameters.path.isDefined, "Valid URI 'path' parameter required.")
     sqlContext.withRasterFrames
@@ -57,6 +58,7 @@ class GeoTiffDataSource
     GeoTiffRelation(sqlContext, p)
   }
 
+  /** Write dataframe containing bands into a single geotiff. Note: performs a driver collect, and is not "big data" friendly.  */
   override def createRelation(sqlContext: SQLContext, mode: SaveMode, parameters: Map[String, String], df: DataFrame): BaseRelation = {
     require(parameters.path.isDefined, "Valid URI 'path' parameter required.")
     val path = parameters.path.get
@@ -67,8 +69,6 @@ class GeoTiffDataSource
 
     require(tileCols.nonEmpty, "Could not find any tile columns.")
 
-
-
     val destCRS = parameters.crs.orElse(df.asLayerSafely.map(_.crs)).getOrElse(
       throw new IllegalArgumentException("A destination CRS must be provided")
     )

datasource/src/main/scala/org/locationtech/rasterframes/datasource/geotiff/GeoTiffDataSource.scala

@@ -37,7 +37,7 @@ class RasterSourceDataSource extends DataSourceRegister with RelationProvider {
   override def shortName(): String = SHORT_NAME
   override def createRelation(sqlContext: SQLContext, parameters: Map[String, String]): BaseRelation = {
     val bands = parameters.bandIndexes
-    val tiling = parameters.tileDims
+    val tiling = parameters.tileDims.orElse(Some(NOMINAL_TILE_DIMS))
     val lazyTiles = parameters.lazyTiles
     val spec = parameters.pathSpec
     val catRef = spec.fold(_.registerAsTable(sqlContext), identity)

datasource/src/main/scala/org/locationtech/rasterframes/datasource/raster/RasterSourceDataSource.scala

@@ -192,29 +192,36 @@ class GeoTiffDataSourceSpec
     }
 
     it("should write GeoTIFF without layer") {
-
       val pr = col("proj_raster_b0")
-      val rf = spark.read.raster.withBandIndexes(0, 1, 2).load(rgbCogSamplePath.toASCIIString)
 
-      val out = Paths.get("target", "example2-geotiff.tif")
-      logger.info(s"Writing to $out")
+      val sample = rgbCogSample
+      val expectedExtent = sample.extent
+      val (expCols, expRows) = sample.tile.dimensions
 
-      withClue("explicit extent/crs") {
+      val rf = spark.read.raster.withBandIndexes(0, 1, 2).load(rgbCogSamplePath.toASCIIString)
+
+      withClue("extent/crs columns provided") {
+        val out = Paths.get("target", "example2a-geotiff.tif")
         noException shouldBe thrownBy {
           rf
             .withColumn("extent", rf_extent(pr))
             .withColumn("crs", rf_crs(pr))
-            .write.geotiff.withCRS(LatLng).save(out.toString)
+            .write.geotiff.withCRS(sample.crs).save(out.toString)
+          checkTiff(out, expCols, expRows, expectedExtent, Some(sample.cellType))
         }
       }
 
-      withClue("without explicit extent/crs") {
+      withClue("without extent/crs columns") {
+        val out = Paths.get("target", "example2b-geotiff.tif")
         noException shouldBe thrownBy {
           rf
-            .write.geotiff.withCRS(LatLng).save(out.toString)
+            .write.geotiff.withCRS(sample.crs).save(out.toString)
+          checkTiff(out, expCols, expRows, expectedExtent, Some(sample.cellType))
         }
       }
+
       withClue("with downsampling") {
+        val out = Paths.get("target", "example2c-geotiff.tif")
         noException shouldBe thrownBy {
           rf
             .write.geotiff
@@ -223,9 +230,6 @@ class GeoTiffDataSourceSpec
             .save(out.toString)
         }
       }
-
-      checkTiff(out, 128, 128,
-        Extent(-76.52586750038186, 36.85907177863949, -76.17461216980891, 37.1303690755922))
     }
 
     it("should produce the correct subregion from layer") {

datasource/src/test/scala/org/locationtech/rasterframes/datasource/geotiff/GeoTiffDataSourceSpec.scala

@@ -4,9 +4,12 @@
 
 ### 0.8.4
 
-* _Breaking_ (potentially): removed `GeoTiffCollectionRelation` due to usage limitation and overlap with `RasterSourceDataSource` functionality.
 * Upgraded to Spark 2.4.4
- * Add `rf_local_is_in` raster function
+* Added forced truncation of WKT types in Markdown/HTML rendering. ([#408](https://github.com/locationtech/rasterframes/pull/408))
+* Add `rf_local_is_in` raster function. ([#400](https://github.com/locationtech/rasterframes/pull/400))
+* Added partitioning to catalogs before processing in RasterSourceDataSource ([#397](https://github.com/locationtech/rasterframes/pull/397))
+* Fixed bug where `rf_tile_dimensions` would cause unnecessary reading of tiles. ([#394](https://github.com/locationtech/rasterframes/pull/394))  
+* _Breaking_ (potentially): removed `GeoTiffCollectionRelation` due to usage limitation and overlap with `RasterSourceDataSource` functionality.
 
 ### 0.8.3