Merge pull request #139 from GIScience/fix-issue-138

round output coordinates to 7 decimal places
closes #138

Author: FabiKo117

CHANGELOG.md

@@ -17,6 +17,7 @@ Changelog
 * update all tests using the filter parameter instead of deprecated types, keys, values ([#98])
 * update some default parameter values in swagger UI to slightly more sensible examples ([#113])
 * restructure packages and classes within the controller and output packages ([#117])
+* round coordinates of returned OSM features to 7 decimal places ([#138])
 
 [#98]: https://github.com/GIScience/ohsome-api/issues/98
 [#111]: https://github.com/GIScience/ohsome-api/issues/111
@@ -25,6 +26,7 @@ Changelog
 [#117]: https://github.com/GIScience/ohsome-api/issues/117
 [#129]: https://github.com/GIScience/ohsome-api/issues/129
 [#131]: https://github.com/GIScience/ohsome-api/issues/131
+[#138]: https://github.com/GIScience/ohsome-api/issues/138
 
 
 ## 1.3.2

docs/endpoints.rst

@@ -1350,7 +1350,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
             "type" : "Point",
             "coordinates" : [
               8.6902451,
-              49.408015899999995
+              49.4080159
             ]
           },
           "properties" : {
@@ -1426,7 +1426,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
             "type" : "Point",
             "coordinates" : [
               8.6902451,
-              49.408015899999995
+              49.4080159
             ]
           },
           "properties" : {
@@ -1502,7 +1502,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
             "type" : "Point",
             "coordinates" : [
               8.6902451,
-              49.408015899999995
+              49.4080159
             ]
           },
           "properties" : {
@@ -1578,7 +1578,7 @@ Get the changes of pharmacies with opening hours in a certain area of Heidelberg
             "type" : "Point",
             "coordinates" : [
               8.6902451,
-              49.408015899999995
+              49.4080159
             ]
           },
           "properties" : {

src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/DataRequestExecutor.java

@@ -120,8 +120,8 @@ public void extract() throws Exception {
       metadata = new Metadata(null, requestResource.getDescription(),
           inputProcessor.getRequestUrlIfGetRequest(servletRequest));
     }
-    ExtractionResponse osmData = new ExtractionResponse(ATTRIBUTION, Application.API_VERSION, metadata,
-        "FeatureCollection", Collections.emptyList());
+    ExtractionResponse osmData = new ExtractionResponse(ATTRIBUTION, Application.API_VERSION,
+        metadata, "FeatureCollection", Collections.emptyList());
     MapReducer<Feature> snapshotPreResult = null;
     if (!isContributionsEndpoint) {
       // handles cases where valid_from = t_start, valid_to = t_end; i.e. non-modified data

src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java

@@ -70,8 +70,8 @@
 import org.heigit.ohsome.ohsomeapi.oshdb.DbConnData;
 import org.heigit.ohsome.ohsomeapi.oshdb.ExtractMetadata;
 import org.heigit.ohsome.ohsomeapi.output.Attribution;
-import org.heigit.ohsome.ohsomeapi.output.ExtractionResponse;
 import org.heigit.ohsome.ohsomeapi.output.Description;
+import org.heigit.ohsome.ohsomeapi.output.ExtractionResponse;
 import org.heigit.ohsome.ohsomeapi.output.Metadata;
 import org.heigit.ohsome.ohsomeapi.output.Response;
 import org.heigit.ohsome.ohsomeapi.output.Result;
@@ -89,7 +89,9 @@
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.Lineal;
 import org.locationtech.jts.geom.Polygonal;
+import org.locationtech.jts.geom.PrecisionModel;
 import org.locationtech.jts.geom.Puntal;
+import org.locationtech.jts.precision.GeometryPrecisionReducer;
 import org.wololo.jts2geojson.GeoJSONWriter;
 
 /** Holds helper methods that are used by the executor classes. */
@@ -98,6 +100,7 @@ public class ExecutionUtils {
   private AtomicReference<Boolean> isFirst;
   private final ProcessingData processingData;
   private final DecimalFormat ratioDf = defineDecimalFormat("#.######");
+  private final GeometryPrecisionReducer gpr = createGeometryPrecisionReducer();
 
   /** Applies a filter on the given MapReducer object using the given parameters. */
   public MapReducer<OSMEntitySnapshot> snapshotFilter(MapReducer<OSMEntitySnapshot> mapRed,
@@ -414,7 +417,8 @@ public org.wololo.geojson.Feature createOSMFeature(OSMEntity entity, Geometry ge
       default:
         outputGeometry = geometry;
     }
-    return new org.wololo.geojson.Feature(gjw.write(outputGeometry), properties);
+    return new org.wololo.geojson.Feature(gjw.write(gpr.reduce(outputGeometry)),
+        properties);
   }
 
   /**
@@ -958,6 +962,17 @@ private Map<String, Object> addAdditionalProperties(OSMEntity entity,
     return properties;
   }
 
+  /**
+   * returns a new geometry precision reducer using a precision of 7 digits, having an activated
+   * point-wise mode and a deactivated remove-collapsed-components mode
+   */
+  private GeometryPrecisionReducer createGeometryPrecisionReducer() {
+    var gpr = new GeometryPrecisionReducer(new PrecisionModel(1E7));
+    gpr.setPointwise(true);
+    gpr.setRemoveCollapsedComponents(false);
+    return gpr;
+  }
+  
   static Set<Integer> keysToKeysInt(String[] keys, TagTranslator tt) {
     final Set<Integer> keysInt;
     if (keys.length != 0) {

src/test/java/org/heigit/ohsome/ohsomeapi/controller/DataExtractionTest.java

@@ -158,6 +158,16 @@ public void elementsCentroidTest() {
    * ./elementsFullHistory/geometry|bbox|centroid tests
    */
 
+  @Test
+  public void elementsGeometryCoordinateTest() {
+    TestRestTemplate restTemplate = new TestRestTemplate();
+    ResponseEntity<JsonNode> response = restTemplate.getForEntity(server + port
+        + "/elements/geometry?bboxes=8.68641,49.41642,8.69499,49.42112&filter=id:node/3429511451&"
+        + "time=2019-01-01", JsonNode.class);
+    JsonNode feature = Helper.getFeatureByIdentifier(response, "@osmId", "node/3429511451");
+    assertEquals(49.418466, feature.get("geometry").get("coordinates").get(1).asDouble(), 0);
+  }
+
   @Test
   public void elementsFullHistoryGeometryTest() {
     TestRestTemplate restTemplate = new TestRestTemplate();
@@ -428,6 +438,16 @@ public void contributionsAssociationChangeSetIdWithOsmIdAndVersion() {
         && featureProperties.get("@osmId").asText().equals("way/96054443"));
   }
 
+  @Test
+  public void contributionsGeometryCoordinateTest() {
+    TestRestTemplate restTemplate = new TestRestTemplate();
+    ResponseEntity<JsonNode> response = restTemplate.getForEntity(server + port
+        + "/contributions/geometry?bboxes=8.68641,49.41642,8.69499,49.42112"
+        + "&filter=id:node/3429511451&time=2017-01-01,2019-01-01", JsonNode.class);
+    JsonNode feature = Helper.getFeatureByIdentifier(response, "@osmId", "node/3429511451");
+    assertEquals(49.418466, feature.get("geometry").get("coordinates").get(1).asDouble(), 0);
+  }
+
   /*
    * ./contributions/latest tests
    */