Incremental updates to type structure.

Author: metasim

build.sbt

@@ -70,20 +70,6 @@ lazy val core = project
       scaffeine,
       scalatest
     ),
-    /** https://github.com/lucidworks/spark-solr/issues/179
-      * Thanks @pomadchin for the tip! */
-    dependencyOverrides ++= {
-      val deps = Seq(
-        "com.fasterxml.jackson.core" % "jackson-core" % "2.6.7",
-        "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.7",
-        "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.7"
-      )
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        // if Scala 2.12+ is used
-        case Some((2, scalaMajor)) if scalaMajor >= 12 => deps
-        case _ => deps :+ "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.7"
-      }
-    },
     buildInfoKeys ++= Seq[BuildInfoKey](
       version, scalaVersion, rfGeoTrellisVersion, rfGeoMesaVersion, rfSparkVersion
     ),

core/src/main/resources/reference.conf

@@ -6,8 +6,7 @@ rasterframes {
   max-truncate-row-element-length = 40
   raster-source-cache-timeout = 120 seconds
 }
-
-vlm.gdal {
+geotrellis.raster.gdal {
     options {
       // See https://trac.osgeo.org/gdal/wiki/ConfigOptions for options
       //CPL_DEBUG = "OFF"

core/src/main/scala/org/locationtech/rasterframes/ref/ProjectedRasterLike.scala

@@ -30,7 +30,7 @@ import geotrellis.vector.Extent
  *
  * @since 11/3/18
  */
-trait ProjectedRasterLike extends CellGrid[Int] {
+trait ProjectedRasterLike  { _: CellGrid[Int] =>
   def crs: CRS
   def extent: Extent
 }

core/src/main/scala/org/locationtech/rasterframes/ref/RFRasterSource.scala

@@ -44,7 +44,7 @@ import scala.concurrent.duration.Duration
  * @since 8/21/18
  */
 @Experimental
-trait RFRasterSource extends ProjectedRasterLike with Serializable {
+abstract class RFRasterSource extends CellGrid[Int] with ProjectedRasterLike with Serializable {
   import RFRasterSource._
 
   def crs: CRS

core/src/main/scala/org/locationtech/rasterframes/ref/RasterRef.scala

@@ -23,7 +23,7 @@ package org.locationtech.rasterframes.ref
 
 import com.typesafe.scalalogging.LazyLogging
 import geotrellis.proj4.CRS
-import geotrellis.raster.{CellType, GridBounds, Tile}
+import geotrellis.raster.{CellGrid, CellType, GridBounds, Tile}
 import geotrellis.vector.{Extent, ProjectedExtent}
 import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
 import org.apache.spark.sql.rf.RasterSourceUDT
@@ -39,7 +39,7 @@ import org.locationtech.rasterframes.tiles.ProjectedRasterTile
  * @since 8/21/18
  */
 case class RasterRef(source: RFRasterSource, bandIndex: Int, subextent: Option[Extent], subgrid: Option[GridBounds[Int]])
-  extends ProjectedRasterLike {
+  extends CellGrid[Int] with ProjectedRasterLike {
   def crs: CRS = source.crs
   def extent: Extent = subextent.getOrElse(source.extent)
   def projectedExtent: ProjectedExtent = ProjectedExtent(extent, crs)

core/src/main/scala/org/locationtech/rasterframes/tiles/FixedDelegatingTile.scala

@@ -26,7 +26,7 @@ import geotrellis.raster.{ArrayTile, DelegatingTile, Tile}
  * Workaround for case where `combine` is invoked on two delegating tiles.
  * @since 8/22/18
  */
-trait FixedDelegatingTile extends DelegatingTile {
+abstract class FixedDelegatingTile extends DelegatingTile {
   override def combine(r2: Tile)(f: (Int, Int) ⇒ Int): Tile = (delegate, r2) match {
     case (del: ArrayTile, r2: DelegatingTile) ⇒ del.combine(r2.toArrayTile())(f)
     case _ ⇒ delegate.combine(r2)(f)

core/src/main/scala/org/locationtech/rasterframes/tiles/ProjectedRasterTile.scala

@@ -40,7 +40,7 @@ import org.locationtech.rasterframes.ref.RasterRef.RasterRefTile
  *
  * @since 9/5/18
  */
-trait ProjectedRasterTile extends FixedDelegatingTile with ProjectedRasterLike {
+abstract class ProjectedRasterTile extends FixedDelegatingTile with ProjectedRasterLike {
   def extent: Extent
   def crs: CRS
   def projectedExtent: ProjectedExtent = ProjectedExtent(extent, crs)

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

@@ -24,7 +24,6 @@ package org.locationtech.rasterframes
 import geotrellis.raster.resample.Bilinear
 import geotrellis.raster.testkit.RasterMatchers
 import geotrellis.raster.{IntConstantNoDataCellType, Raster, Tile}
-import geotrellis.vector.Extent
 import org.apache.spark.SparkConf
 import org.apache.spark.sql.functions._
 import org.locationtech.rasterframes.expressions.aggregates.TileRasterizerAggregate
@@ -158,8 +157,6 @@ class RasterJoinSpec extends TestEnvironment with TestData with RasterMatchers {
 
       total18 should be > 0.0
       total18 should be < total17
-
-
     }
 
     it("should pass through ancillary columns") {

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

@@ -23,7 +23,7 @@ package org.locationtech.rasterframes.datasource.geotiff
 import java.nio.file.{Path, Paths}
 
 import geotrellis.proj4._
-import geotrellis.raster.CellType
+import geotrellis.raster.{CellType, Dimensions}
 import geotrellis.raster.io.geotiff.{MultibandGeoTiff, SinglebandGeoTiff}
 import geotrellis.vector.Extent
 import org.locationtech.rasterframes._
@@ -93,7 +93,7 @@ class GeoTiffDataSourceSpec
 
     def checkTiff(file: Path, cols: Int, rows: Int, extent: Extent, cellType: Option[CellType] = None) = {
       val outputTif = SinglebandGeoTiff(file.toString)
-      outputTif.tile.dimensions should be ((cols, rows))
+      outputTif.tile.dimensions should be (Dimensions(cols, rows))
       outputTif.extent should be (extent)
       cellType.foreach(ct =>
         outputTif.cellType should be (ct)

project/RFDependenciesPlugin.scala

@@ -57,6 +57,20 @@ object RFDependenciesPlugin extends AutoPlugin {
       "Open Source Geospatial Foundation Repository" at "http://download.osgeo.org/webdav/geotools/"
     ),
 
+    /** https://github.com/lucidworks/spark-solr/issues/179
+      * Thanks @pomadchin for the tip! */
+    dependencyOverrides ++= {
+      val deps = Seq(
+        "com.fasterxml.jackson.core" % "jackson-core" % "2.6.7",
+        "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.7",
+        "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.7"
+      )
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        // if Scala 2.12+ is used
+        case Some((2, scalaMajor)) if scalaMajor >= 12 => deps
+        case _ => deps :+ "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.7"
+      }
+    },
     // NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
     rfSparkVersion := "2.4.4",
     rfGeoTrellisVersion := "3.0.0",