fix milliseconds in TimestampToISO8601TimeString

System clock is using nanosecond precision, to get number of millisecond from epoch start, it is necessary to use duration_cast to milliseconds.
Framstag · Jan 31, 2024 · 8dbbbfc · 8dbbbfc
1 parent 7e7378e
commit 8dbbbfc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Tests/src/TimeParse.cpp b/Tests/src/TimeParse.cpp
@@ -4,8 +4,16 @@
 
 TEST_CASE("Parse ISO8601 time string") {
   osmscout::Timestamp ts;
-  std::string testString="2017-03-12T14:31:56.0Z";
+  std::string testString="2017-03-12T14:31:56.000Z";
   REQUIRE(osmscout::ParseISO8601TimeString(testString, ts));
   REQUIRE(std::chrono::duration_cast<std::chrono::milliseconds>(ts.time_since_epoch()).count()==1489329116000);
   REQUIRE(osmscout::TimestampToISO8601TimeString(ts)==testString);
 }
+
+TEST_CASE("Parse ISO8601 time string with millisecond precision") {
+  osmscout::Timestamp ts;
+  std::string testString="2017-03-12T14:31:56.012Z";
+  REQUIRE(osmscout::ParseISO8601TimeString(testString, ts));
+  REQUIRE(std::chrono::duration_cast<std::chrono::milliseconds>(ts.time_since_epoch()).count()==1489329116012);
+  REQUIRE(osmscout::TimestampToISO8601TimeString(ts)==testString);
+}
diff --git a/libosmscout/src/osmscout/util/String.cpp b/libosmscout/src/osmscout/util/String.cpp
@@ -718,9 +718,9 @@ namespace osmscout {
     stream << buff.data();
 
     // add milliseconds
-    auto millisFromEpoch = timestamp.time_since_epoch().count();
+    auto millisFromEpoch = duration_cast<milliseconds>(timestamp.time_since_epoch()).count();
     stream << ".";
-    stream << (millisFromEpoch - ((millisFromEpoch / 1000) * 1000));
+    stream << std::setfill('0') << std::setw(3) << (millisFromEpoch - ((millisFromEpoch / 1000) * 1000));
     stream << "Z";
     return stream.str();
   }