implementing geojson response for all /groupBy/boundary requests

works so far only if geojson is given as input
GIScience · Jul 16, 2018 · 5bd6f4c · 5bd6f4c
1 parent d193b96
commit 5bd6f4c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/...ain/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/controller/ParameterDescriptions.java b/...ain/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/controller/ParameterDescriptions.java
@@ -18,6 +18,7 @@ public class ParameterDescriptions {
       "OSM value(s) e.g.: 'primary', 'residential'; default: no value";
   public static final String USERIDS_DESCR = "OSM userids; default: no userid";
   public static final String TIME_DESCR = "ISO-8601 conform timestring(s); default: today";
+  public static final String FORMAT_DESCR = "Output format, e.g.: geojson; default: json";
   public static final String SHOW_METADATA_DESCR =
       "'Boolean' operator 'true' or 'false'; default: 'false'";
 

diff --git a/...org/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/AreaController.java b/...org/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/AreaController.java
@@ -177,13 +177,15 @@ public GroupByResponse getAreaGroupByBoundary(
           required = false) String[] userids,
       @ApiParam(hidden = true) @RequestParam(value = "time", defaultValue = "",
           required = false) String[] time,
+      @ApiParam(hidden = true) @RequestParam(value = "format", defaultValue = "",
+          required = false) String format,
       @ApiParam(hidden = true) @RequestParam(value = "showMetadata",
           defaultValue = "false") String showMetadata)
       throws UnsupportedOperationException, Exception {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.AREA, new RequestParameters(false, true, false, bboxes, bcircles, bpolys,
-            types, keys, values, userids, time, showMetadata));
+        RequestResource.AREA, RequestParameters.of(false, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**
@@ -819,6 +821,8 @@ public GroupByResponse postAreaGroupByUser(String bboxes, String bcircles, Strin
       @ApiImplicitParam(name = "time", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.TIME, required = false,
           value = ParameterDescriptions.TIME_DESCR),
+      @ApiImplicitParam(name = "format", paramType = "form", dataType = "string", required = false,
+          value = ParameterDescriptions.FORMAT_DESCR),
       @ApiImplicitParam(name = "showMetadata", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.SHOW_METADATA, required = false,
           value = ParameterDescriptions.SHOW_METADATA_DESCR)})
@@ -830,8 +834,8 @@ public GroupByResponse postAreaGroupByBoundary(String bboxes, String bcircles, S
       throws UnsupportedOperationException, Exception, BadRequestException {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.AREA, new RequestParameters(true, true, false, bboxes, bcircles, bpolys,
-            types, keys, values, userids, time, showMetadata));
+        RequestResource.AREA, RequestParameters.of(false, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**

diff --git a/...rg/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/CountController.java b/...rg/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/CountController.java
@@ -843,18 +843,21 @@ public GroupByResponse postCountGroupByUser(String bboxes, String bcircles, Stri
       @ApiImplicitParam(name = "time", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.TIME, required = false,
           value = ParameterDescriptions.TIME_DESCR),
+      @ApiImplicitParam(name = "format", paramType = "form", dataType = "string", required = false,
+          value = ParameterDescriptions.FORMAT_DESCR),
       @ApiImplicitParam(name = "showMetadata", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.SHOW_METADATA, required = false,
           value = ParameterDescriptions.SHOW_METADATA_DESCR)})
   @RequestMapping(value = "/groupBy/boundary", method = RequestMethod.POST,
       produces = "application/json", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
   public GroupByResponse postCountGroupByBoundary(String bboxes, String bcircles, String bpolys,
       String[] types, String[] keys, String[] values, String[] userids, String[] time,
-      String showMetadata) throws UnsupportedOperationException, Exception, BadRequestException {
+      String format, String showMetadata)
+      throws UnsupportedOperationException, Exception, BadRequestException {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.COUNT, new RequestParameters(true, true, false, bboxes, bcircles, bpolys,
-            types, keys, values, userids, time, showMetadata));
+        RequestResource.COUNT, RequestParameters.of(true, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**

diff --git a/...g/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/LengthController.java b/...g/heigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/LengthController.java
@@ -138,13 +138,15 @@ public GroupByResponse getLengthGroupByBoundary(
           required = false) String[] userids,
       @ApiParam(hidden = true) @RequestParam(value = "time", defaultValue = "",
           required = false) String[] time,
+      @ApiParam(hidden = true) @RequestParam(value = "format", defaultValue = "",
+          required = false) String format,
       @ApiParam(hidden = true) @RequestParam(value = "showMetadata",
           defaultValue = "false") String showMetadata)
       throws UnsupportedOperationException, Exception {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.LENGTH, new RequestParameters(false, true, false, bboxes, bcircles, bpolys,
-            types, keys, values, userids, time, showMetadata));
+        RequestResource.LENGTH, RequestParameters.of(false, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**
@@ -692,6 +694,8 @@ RequestResource.LENGTH, new RequestParameters(true, true, false, bboxes, bcircle
       @ApiImplicitParam(name = "time", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.TIME, required = false,
           value = ParameterDescriptions.TIME_DESCR),
+      @ApiImplicitParam(name = "format", paramType = "form", dataType = "string", required = false,
+          value = ParameterDescriptions.FORMAT_DESCR),
       @ApiImplicitParam(name = "showMetadata", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.SHOW_METADATA, required = false,
           value = ParameterDescriptions.SHOW_METADATA_DESCR)})
@@ -703,8 +707,8 @@ public GroupByResponse postLengthGroupByBoundary(String bboxes, String bcircles,
       throws UnsupportedOperationException, Exception, BadRequestException {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.LENGTH, new RequestParameters(true, true, false, bboxes, bcircles, bpolys,
-            types, keys, values, userids, time, showMetadata));
+        RequestResource.LENGTH, RequestParameters.of(true, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**

diff --git a/...eigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/PerimeterController.java b/...eigit/bigspatialdata/ohsome/ohsomeApi/controller/dataAggregation/PerimeterController.java
@@ -177,13 +177,15 @@ public GroupByResponse getPerimeterGroupByBoundary(
           required = false) String[] userids,
       @ApiParam(hidden = true) @RequestParam(value = "time", defaultValue = "",
           required = false) String[] time,
+      @ApiParam(hidden = true) @RequestParam(value = "format", defaultValue = "",
+          required = false) String format,
       @ApiParam(hidden = true) @RequestParam(value = "showMetadata",
           defaultValue = "false") String showMetadata)
       throws UnsupportedOperationException, Exception {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.PERIMETER, new RequestParameters(false, true, false, bboxes, bcircles,
-            bpolys, types, keys, values, userids, time, showMetadata));
+        RequestResource.PERIMETER, RequestParameters.of(false, true, false, bboxes, bcircles,
+            bpolys, types, keys, values, userids, time, format, showMetadata));
   }
 
   /**
@@ -820,6 +822,8 @@ RequestResource.PERIMETER, new RequestParameters(true, true, false, bboxes, bcir
       @ApiImplicitParam(name = "time", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.TIME, required = false,
           value = ParameterDescriptions.TIME_DESCR),
+      @ApiImplicitParam(name = "format", paramType = "form", dataType = "string", required = false,
+          value = ParameterDescriptions.FORMAT_DESCR),
       @ApiImplicitParam(name = "showMetadata", paramType = "form", dataType = "string",
           defaultValue = DefaultSwaggerParameters.SHOW_METADATA, required = false,
           value = ParameterDescriptions.SHOW_METADATA_DESCR)})
@@ -831,8 +835,8 @@ public GroupByResponse postPerimeterGroupByBoundary(String bboxes, String bcircl
       throws UnsupportedOperationException, Exception, BadRequestException {
 
     return ElementsRequestExecutor.executeCountLengthPerimeterAreaGroupByBoundary(
-        RequestResource.PERIMETER, new RequestParameters(true, true, false, bboxes, bcircles,
-            bpolys, types, keys, values, userids, time, showMetadata));
+        RequestResource.PERIMETER, RequestParameters.of(true, true, false, bboxes, bcircles, bpolys,
+            types, keys, values, userids, time, format, showMetadata));
   }
 
   /**

diff --git a/...ain/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/executor/ElementsRequestExecutor.java b/...ain/java/org/heigit/bigspatialdata/ohsome/ohsomeApi/executor/ElementsRequestExecutor.java
@@ -186,7 +186,6 @@ public static GroupByResponse executeCountLengthPerimeterAreaGroupByBoundary(
       metadata = new Metadata(duration, Description.countLengthPerimeterAreaGroupByBoundary(
           requestResource.getLabel(), requestResource.getUnit()), requestURL);
     }
-
     if (rPs.getFormat() != null && rPs.getFormat().equalsIgnoreCase("geojson")) {
       GroupByResponse response = GroupByResponse.of(new Attribution(url, text),
           Application.apiVersion, metadata, "FeatureCollection",