Merge branch 'release/5.0.0'

WikiWatershed · Nov 6, 2021 · a05340b · a05340b
2 parents 0b54124 + f966c2d
commit a05340b
Show file tree

Hide file tree

Showing 11 changed files with 1,458 additions and 311 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 5.0.0
+
+- Update `/multi` endpoint to take the same format of stream data
+  as the `/run` endpoint does: a list of MultiLineStrings instead
+  of a single one. Also update existing examples, and add new ones.
+  This is a breaking change.
+
 ## 4.0.3
 
 - Update credentials for Travis to fix deployments

diff --git a/api/src/main/scala/Geoprocessing.scala b/api/src/main/scala/Geoprocessing.scala
@@ -67,13 +67,8 @@ trait Geoprocessing extends Utils {
             case "RasterLinesJoin" =>
               input.streamLines match {
                 case Some(mls) => {
-                  (parseMultiLineString(mls) & shape).asMultiLine match {
-                    case Some(lines) =>
-                      rasterLinesJoin(layers, Seq(lines))
-                        .mapValues(_.toDouble)
-                    case None =>
-                      Map[String, Double]()
-                  }
+                  val lines = cropLinesToAOI(mls.map(parseMultiLineString), shape)
+                  rasterLinesJoin(layers, lines).mapValues(_.toDouble)
                 }
                 case None =>
                   throw new MissingStreamLinesException

diff --git a/api/src/main/scala/WebServer.scala b/api/src/main/scala/WebServer.scala
@@ -43,7 +43,7 @@ case class Operation (
 
 case class MultiInput (
   shapes: List[HUC],
-  streamLines: Option[GeoJSONString], // GeoJSON MultiLineString
+  streamLines: Option[List[GeoJSONString]], // GeoJSON MultiLineString
   operations: List[Operation]
 )
 

diff --git a/examples/MultiOperationRequest.json b/examples/MultiOperationRequest.json
diff --git a/examples/MultiOperationRequestHUC12.json b/examples/MultiOperationRequestHUC12.json
diff --git a/examples/MultiOperationRequestHUC12HiResStreams.json b/examples/MultiOperationRequestHUC12HiResStreams.json
diff --git a/examples/MultiOperationRequestHUC8.json b/examples/MultiOperationRequestHUC8.json