Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collection API: Upgrade GeoTrellis #61

Merged
merged 2 commits into from
Aug 8, 2017
+8 −4
Merged

Collection API: Upgrade GeoTrellis #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7432dcf
Upgrade GeoTrellis to 1.1.1
rajadain Aug 8, 2017
77c8ab4
Use GeoTrellis value to demo
rajadain Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/src/main/scala/WebServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
9 changes: 6 additions & 3 deletions project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting that we can use both GT versions simultaneously. I guess that's a benefit of having a multi-project build.

"org.apache.spark" %% "spark-core" % Version.spark % "provided",
"org.apache.hadoop" % "hadoop-client" % Version.hadoop % "provided",
"spark.jobserver" %% "job-server-api" % Version.jobserver % "provided"
Expand Down