Merge pull request #391 from internetofwater/ew-dev-test

getBasin fix and st_union rollback
internetofwater · Jan 11, 2024 · bb05c69 · bb05c69
2 parents b63e73b + 6144b3b
commit bb05c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/gov/usgs/owi/nldi/controllers/LinkedDataController.java b/src/main/java/gov/usgs/owi/nldi/controllers/LinkedDataController.java
@@ -354,7 +354,7 @@ public void getCharacteristicData(
   public void getBasin(
       HttpServletRequest request,
       HttpServletResponse response,
-      @PathVariable(LookupDao.FEATURE_SOURCE) @Schema(example = "wqp") String featureSource,
+      @PathVariable(LookupDao.FEATURE_SOURCE) @Schema(example = "WQP") String featureSource,
       @PathVariable(Parameters.FEATURE_ID) @Schema(example = "USGS-054279485") String featureID,
       @RequestParam(value = Parameters.SIMPLIFIED, required = false, defaultValue = "true")
           Boolean simplified,

diff --git a/src/main/resources/mybatis/stream.xml b/src/main/resources/mybatis/stream.xml
@@ -63,10 +63,10 @@
                    )
         select <choose>
                     <when test="simplified == true">
-                        st_asgeojson(st_simplify(st_memunion(catchmentsp.the_geom), .001), 9, 0) shape
+                        st_asgeojson(st_simplify(st_union(catchmentsp.the_geom), .001), 9, 0) shape
                     </when>
                     <otherwise>
-                        st_asgeojson(st_memunion(catchmentsp.the_geom), 9, 0) shape
+                        st_asgeojson(st_union(catchmentsp.the_geom), 9, 0) shape
                     </otherwise>
                 </choose>
           from navigation_results