fix timestamp format in ratio/groupBy/boundary endpoint, closes #318

GIScience · Nov 23, 2023 · 560909a · 560909a
1 parent 88b7167
commit 560909a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ Changelog
 
 ## 1.11.0-SNAPSHOT (current master)
 
+### Bug Fixes
+* Fix inconsistent timestamp format in `/elements/(aggregation)/ratio/groupBy/boundary` request responses ([#318])
+
+[#318]: https://github.com/GIScience/ohsome-api/issues/318
+
+
 ## 1.10.1
 
 * Fix performance degradation in previous release (version 1.10.0) which made data extractions very slow for medium to large query areas ([oshdb#516])

diff --git a/src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/ElementsRequestExecutor.java b/src/main/lombok/org/heigit/ohsome/ohsomeapi/executor/ElementsRequestExecutor.java
@@ -923,9 +923,10 @@ public static <P extends Geometry & Polygonal> Response aggregateBasicFiltersRat
           resultValues2[matchesBothCount] = resultValues2[matchesBothCount]
               + Double.parseDouble(df.format(innerEntry.getValue().doubleValue()));
           if (!timeArrayFilled) {
-            String time = innerEntry.getKey().getFirstIndex().toString();
+            String time = TimestampFormatter.getInstance().isoDateTime(
+                innerEntry.getKey().getFirstIndex());
             if (matchesBothCount == 0 || !timeArray[timeArrayCount - 1].equals(time)) {
-              timeArray[timeArrayCount] = innerEntry.getKey().getFirstIndex().toString();
+              timeArray[timeArrayCount] = time;
               timeArrayCount++;
             }
           }
@@ -1083,9 +1084,10 @@ public static <P extends Geometry & Polygonal> Response aggregateRatioGroupByBou
           resultValues2[matchesBothCount] = resultValues2[matchesBothCount]
               + Double.parseDouble(df.format(innerEntry.getValue().doubleValue()));
           if (!timeArrayFilled) {
-            String time = innerEntry.getKey().getFirstIndex().toString();
+            String time = TimestampFormatter.getInstance().isoDateTime(
+                innerEntry.getKey().getFirstIndex());
             if (matchesBothCount == 0 || !timeArray[timeArrayCount - 1].equals(time)) {
-              timeArray[timeArrayCount] = innerEntry.getKey().getFirstIndex().toString();
+              timeArray[timeArrayCount] = time;
               timeArrayCount++;
             }
           }

diff --git a/src/test/java/org/heigit/ohsome/ohsomeapi/controller/PostControllerTest.java b/src/test/java/org/heigit/ohsome/ohsomeapi/controller/PostControllerTest.java
@@ -742,6 +742,8 @@ public void elementsAreaRatioGroupByBoundaryTest() {
         server + port + "/elements/area/ratio/groupBy/boundary", map, JsonNode.class);
     assertEquals(expectedValue, response.getBody().get("groupByBoundaryResult").get(1)
         .get("ratioResult").get(0).get("ratio").asDouble(), expectedValue * deltaPercentage);
+    assertEquals("2017-01-01T00:00:00Z", response.getBody().get("groupByBoundaryResult").get(1)
+        .get("ratioResult").get(0).get("timestamp").asText());
   }
 
   @Test