Merge pull request #61 from WikiWatershed/tt/upgrade-geotrellis

Collection API: Upgrade GeoTrellis Connects #49
WikiWatershed · Aug 8, 2017 · a554418 · a554418
2 parents 256c14c + 77c8ab4
commit a554418
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/api/src/main/scala/WebServer.scala b/api/src/main/scala/WebServer.scala
@@ -9,6 +9,8 @@ import DefaultJsonProtocol._
 import com.typesafe.config.ConfigFactory
 import com.typesafe.scalalogging.LazyLogging
 
+import geotrellis.raster.NODATA
+
 object WebServer extends HttpApp with App with LazyLogging {
   def routes: Route =
     get {
@@ -20,7 +22,6 @@ object WebServer extends HttpApp with App with LazyLogging {
       path("run") {
         entity(as[String]) { input =>
           println(input)
-          val NODATA = Int.MinValue
           val output = Map(
             List(90, 1) -> 1,
             List(31, 3) -> 57,

diff --git a/project/build.scala b/project/build.scala
@@ -10,7 +10,8 @@ object Version {
   def either(environmentVariable: String, default: String): String =
     Properties.envOrElse(environmentVariable, default)
 
-  val geotrellis   = "0.10.0"
+  val geotrellis   = "1.1.1"
+  val geotrellisOld = "0.10.0"
   val scala        = either("SCALA_VERSION", "2.11.11")
   val scalatest    = "2.2.1"
   lazy val jobserver = either("SPARK_JOBSERVER_VERSION", "0.6.1")
@@ -94,6 +95,8 @@ object Geoprocessing extends Build {
   lazy val apiSettings =
     Seq(
       libraryDependencies ++= Seq(
+        "org.locationtech.geotrellis" %% "geotrellis-spark" % Version.geotrellis,
+        "org.locationtech.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
         "com.typesafe.akka" %% "akka-actor" % Version.akkaVersion,
         "com.typesafe.akka" %% "akka-http" % Version.akkaHttpVersion,
         "com.typesafe.akka" %% "akka-stream" % Version.akkaVersion,
@@ -107,8 +110,8 @@ object Geoprocessing extends Build {
   lazy val summarySettings =
     Seq(
       libraryDependencies ++= Seq(
-        "com.azavea.geotrellis" %% "geotrellis-spark" % Version.geotrellis,
-        "com.azavea.geotrellis" %% "geotrellis-s3" % Version.geotrellis,
+        "com.azavea.geotrellis" %% "geotrellis-spark" % Version.geotrellisOld,
+        "com.azavea.geotrellis" %% "geotrellis-s3" % Version.geotrellisOld,
         "org.apache.spark" %% "spark-core" % Version.spark % "provided",
         "org.apache.hadoop" % "hadoop-client" % Version.hadoop % "provided",
         "spark.jobserver" %% "job-server-api" % Version.jobserver % "provided"