code improvement

renaming method and moving parts elsewhere
GIScience · Jul 19, 2018 · ab5295c · ab5295c
1 parent d755459
commit ab5295c
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/src/main/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/inputProcessing/InputProcessor.java b/src/main/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/inputProcessing/InputProcessor.java
@@ -107,7 +107,7 @@ else if (showMetadata.replaceAll("\\s", "").equalsIgnoreCase("false")
     else
       throw new BadRequestException(
           "The showMetadata parameter can only contain the values 'true', 'yes', 'false' or 'no' written as text(String).");
-    checkBoundaryParams(bboxes, bcircles, bpolys);
+    boundary = setBoundaryType(bboxes, bcircles, bpolys);
     try {
       switch (boundary) {
         case NOBOUNDARY:
@@ -117,20 +117,25 @@ else if (showMetadata.replaceAll("\\s", "").equalsIgnoreCase("false")
           mapRed = mapRed.areaOfInterest((Geometry & Polygonal) ExtractMetadata.dataPoly);
           break;
         case BBOXES:
+          boundaryValues = utils.splitBoundaryParam(bboxes, boundary);
           mapRed = mapRed
               .areaOfInterest((Geometry & Polygonal) geomBuilder.createBboxes(boundaryValues));
           break;
         case BCIRCLES:
+          boundaryValues = utils.splitBoundaryParam(bcircles, boundary);
           mapRed = mapRed.areaOfInterest(
               (Geometry & Polygonal) geomBuilder.createCircularPolygons(boundaryValues));
           break;
         case BPOLYS:
-          if (boundaryValues == null)
+          if (bpolys.replaceAll("\\s", "").startsWith("{")) {
             mapRed = mapRed.areaOfInterest(
                 (Geometry & Polygonal) geomBuilder.createGeometryFromGeoJson(bpolys, this));
-          else
+          }
+          else {
+            boundaryValues = utils.splitBoundaryParam(bpolys, boundary);
             mapRed = mapRed
                 .areaOfInterest((Geometry & Polygonal) geomBuilder.createBpolys(boundaryValues));
+          }
           break;
         default:
           throw new BadRequestException(
@@ -446,10 +451,9 @@ private void checkOSMTypes(String[] types) throws BadRequestException {
   }
 
   /**
-   * Checks the given boundary parameter(s), sets a corresponding enum (NOBOUNDARY for no boundary,
-   * BBOXES for bboxes, BCIRCLES for bcircles, BPOLYS for bpolys) and saves the splitted coordinates
-   * into an array (in case of non-GeoJSON). Only one (or none) of the boundary parameters is
-   * allowed to have content in it.
+   * Sets a corresponding enum (NOBOUNDARY for no boundary, BBOXES for bboxes, BCIRCLES for
+   * bcircles, BPOLYS for bpolys) based on the given boundary parameter(s). Only one (or none) of
+   * them is allowed to have content in it.
    * 
    * @param bboxes <code>String</code> containing the bounding boxes separated via a pipe (|) and
    *        optional custom names at each first coordinate appended with a colon (:).
@@ -458,24 +462,16 @@ private void checkOSMTypes(String[] types) throws BadRequestException {
    * @param bpolys <code>String</code> containing the bounding polygons separated via a pipe (|) and
    *        optional custom names at each first coordinate appended with a colon (:).
    */
-  private void checkBoundaryParams(String bboxes, String bcircles, String bpolys) {
-    if (bboxes.isEmpty() && bcircles.isEmpty() && bpolys.isEmpty()) {
-      boundary = BoundaryType.NOBOUNDARY;
-    } else if (!bboxes.isEmpty() && bcircles.isEmpty() && bpolys.isEmpty()) {
-      boundary = BoundaryType.BBOXES;
-      boundaryValues = utils.splitBoundaryParam(bboxes, boundary);
-    } else if (bboxes.isEmpty() && !bcircles.isEmpty() && bpolys.isEmpty()) {
-      boundary = BoundaryType.BCIRCLES;
-      boundaryValues = utils.splitBoundaryParam(bcircles, boundary);
-    } else if (bboxes.isEmpty() && bcircles.isEmpty() && !bpolys.isEmpty()) {
-      boundary = BoundaryType.BPOLYS;
-      if (bpolys.replaceAll("\\s", "").startsWith("{")) {
-        // geoJson expected
-        boundaryValues = null;
-      } else {
-        boundaryValues = utils.splitBoundaryParam(bpolys, boundary);
-      }
-    } else
+  private BoundaryType setBoundaryType(String bboxes, String bcircles, String bpolys) {
+    if (bboxes.isEmpty() && bcircles.isEmpty() && bpolys.isEmpty())
+      return BoundaryType.NOBOUNDARY;
+    else if (!bboxes.isEmpty() && bcircles.isEmpty() && bpolys.isEmpty())
+      return BoundaryType.BBOXES;
+    else if (bboxes.isEmpty() && !bcircles.isEmpty() && bpolys.isEmpty())
+      return BoundaryType.BCIRCLES;
+    else if (bboxes.isEmpty() && bcircles.isEmpty() && !bpolys.isEmpty())
+      return BoundaryType.BPOLYS;
+    else
       throw new BadRequestException(
           "Your provided boundary parameter (bboxes, bcircles, or bpolys) does not fit its format, "
               + "or you defined more than one boundary parameter.");