Merge branch 'release/4.0.1'

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 4.0.1
+
+- Update `/multi` endpoint to take a set of shapes and a
+  MultiLine string of streamLines, such that there may be
+  shapes that do not intersect any of the streamLines at
+  all, and still return results. Previously this would
+  cause a 500 with the following error:
+
+      java.util.NoSuchElementException: None.get
+
+  Now we simply return that operation with an empty object,
+  like so:
+
+       "nlcd_streams": {},
+
 ## 4.0.0
 
 - Add a new `/multi` endpoint that can take a set of shapes,

api/src/main/scala/Geoprocessing.scala

@@ -67,8 +67,13 @@ trait Geoprocessing extends Utils {
             case "RasterLinesJoin" =>
               input.streamLines match {
                 case Some(mls) => {
-                  val lines = (parseMultiLineString(mls) & shape).asMultiLine.get
-                  rasterLinesJoin(layers, Seq(lines)).mapValues(_.toDouble)
+                  (parseMultiLineString(mls) & shape).asMultiLine match {
+                    case Some(lines) =>
+                      rasterLinesJoin(layers, Seq(lines))
+                        .mapValues(_.toDouble)
+                    case None =>
+                      Map[String, Double]()
+                  }
                 }
                 case None =>
                   throw new MissingStreamLinesException

project/build.scala

@@ -30,7 +30,7 @@ object Geoprocessing extends Build {
     super.settings ++
   Seq(
     shellPrompt := { s => Project.extract(s).currentProject.id + " > " },
-    version := "4.0.0",
+    version := "4.0.1",
     scalaVersion := Version.scala,
     organization := "org.wikiwatershed.mmw.geoprocessing",
     name := "mmw-geoprocessing",