Update branch up to the latest SNAPSHOT

geotrellis · Jul 17, 2019 · 976ac80 · 976ac80
1 parent d4d198d
commit 976ac80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -124,7 +124,7 @@ lazy val gdal = project
     name := "geotrellis-contrib-gdal",
     libraryDependencies ++= Seq(
       gdalWarp,
-      sparkCore % Test,
+      sparkCore % Provided,
       sparkSQL % Test,
       geotrellisSparkTestKit % Test,
       scalatest % Test,

diff --git a/vlm/src/main/scala/geotrellis/contrib/vlm/avro/GeotrellisReprojectRasterSource.scala b/vlm/src/main/scala/geotrellis/contrib/vlm/avro/GeotrellisReprojectRasterSource.scala
@@ -62,7 +62,7 @@ class GeotrellisReprojectRasterSource(
     for {
       subExtent <- this.extent.intersection(extent)
       targetRasterExtent = this.gridExtent.createAlignedRasterExtent(subExtent)
-      sourceExtent = targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).envelope
+      sourceExtent = targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).getEnvelopeInternal
       sourceRegion = sourceLayer.metadata.layout.createAlignedGridExtent(sourceExtent)
       _ = {
         lazy val tileBounds = sourceLayer.metadata.mapTransform.extentToBounds(sourceExtent)

diff --git a/vlm/src/main/scala/geotrellis/contrib/vlm/effect/geotiff/GeoTiffReprojectRasterSource.scala b/vlm/src/main/scala/geotrellis/contrib/vlm/effect/geotiff/GeoTiffReprojectRasterSource.scala
@@ -120,7 +120,7 @@ case class GeoTiffReprojectRasterSource[F[_]: Monad: UnsafeLift](
             )
             // A tmp workaround for https://github.com/locationtech/proj4j/pull/29
             // Stacktrace details: https://github.com/geotrellis/geotrellis-contrib/pull/206#pullrequestreview-260115791
-            val sourceExtent = Proj4Transform.synchronized(targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).envelope)
+            val sourceExtent = Proj4Transform.synchronized(targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).getEnvelopeInternal)
             val sourcePixelBounds = closestTiffOverview.rasterExtent.gridBoundsFor(sourceExtent, clamp = true)
             (sourcePixelBounds, targetRasterExtent)
           }

diff --git a/vlm/src/main/scala/geotrellis/contrib/vlm/geotiff/GeoTiffReprojectRasterSource.scala b/vlm/src/main/scala/geotrellis/contrib/vlm/geotiff/GeoTiffReprojectRasterSource.scala
@@ -110,7 +110,7 @@ case class GeoTiffReprojectRasterSource(
 
       // A tmp workaround for https://github.com/locationtech/proj4j/pull/29
       // Stacktrace details: https://github.com/geotrellis/geotrellis-contrib/pull/206#pullrequestreview-260115791
-      val sourceExtent = Proj4Transform.synchronized(targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).envelope)
+      val sourceExtent = Proj4Transform.synchronized(targetRasterExtent.extent.reprojectAsPolygon(backTransform, 0.001).getEnvelopeInternal)
       val sourcePixelBounds = closestTiffOverview.rasterExtent.gridBoundsFor(sourceExtent, clamp = true)
       (sourcePixelBounds, targetRasterExtent)
     }}.toMap