Changeset 17987 in josm

Timestamp:

2021-07-10T22:54:00+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20992 - see #17829 - support UTC dates with 6 digits

Location:

trunk

Files:

• nodist/data/rtklib_example3.pos (added)
• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -136 +136 @@
             }
             return local.toInstant();
+        } else if (checkLayout(str, "xxxx/xx/xx xx:xx:xx.xxxxxx")) {
+            return ZonedDateTime.of(
+                parsePart4(str, 0),
+                parsePart2(str, 5),
+                parsePart2(str, 8),
+                parsePart2(str, 11),
+                parsePart2(str, 14),
+                parsePart2(str, 17),
+                parsePart6(str, 20) * 1_000,
+                ZoneOffset.UTC
+            ).toInstant();
         } else {
             // example date format "18-AUG-08 13:33:03"
@@ -232 +243 @@
     }
 
+    private static int parsePart6(String str, int off) {
+        return 100000 * num(str.charAt(off))
+              + 10000 * num(str.charAt(off + 1))
+               + 1000 * num(str.charAt(off + 2))
+                + 100 * num(str.charAt(off + 3))
+                 + 10 * num(str.charAt(off + 4))
+                      + num(str.charAt(off + 5));
+    }
+
     /**
      * Returns a new {@code SimpleDateFormat} for date only, according to <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a>.

trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java

@@ -76 +76 @@
         assertEquals(6, in.getNumberOfCoordinates());
     }
+
+    /**
+     * Tests reading another RTKLib pos file with yet another different date format.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    void testReader3() throws Exception {
+        RtkLibPosReader in = read("nodist/data/rtklib_example3.pos");
+        assertEquals(1, in.getNumberOfCoordinates());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -103 +103 @@
         assertEquals(481161600000L, DateUtils.fromString("1985-04").getTime());
         assertEquals(473385600000L, DateUtils.fromString("1985").getTime());
+    }
+
+    @Test
+    void testRtklib() {
+        // examples taken from rtklib .pos files
+        assertEquals("2019-04-21T08:20:32Z", DateUtils.parseInstant("2019/04/21 08:20:32").toString());
+        assertEquals("2019-06-08T08:23:12.123Z", DateUtils.parseInstant("2019/06/08 08:23:12.123").toString());
+        assertEquals("2021-03-30T15:04:01.123456Z", DateUtils.parseInstant("2021/03/30 15:04:01.123456").toString());
     }