Changeset 15343 in josm for trunk

Timestamp:

2019-09-09T23:22:13+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18114 - support short date/time format in RTKLib .pos files

Location:

trunk

Files:

• data_nodist/rtklib_example2.pos (added)
• src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/rtklib/RtkLibPosReader.java

@@ -12 +12 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Locale;
 import java.util.Objects;
@@ -49 +50 @@
     private static final int IDX_RATIO = 14;
 
-    private final SimpleDateFormat dateTimeFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS", Locale.ENGLISH); // 2019/06/08 08:23:15.000
+    private final SimpleDateFormat dateTimeFmtS = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss", Locale.ENGLISH); // 2019/06/08 08:23:15
+    private final SimpleDateFormat dateTimeFmtL = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS", Locale.ENGLISH); // 2019/06/08 08:23:15.000
 
     private final InputStream source;
@@ -62 +64 @@
     public RtkLibPosReader(InputStream source) throws IOException {
         this.source = Objects.requireNonNull(source);
-        dateTimeFmt.setTimeZone(DateUtils.UTC);
+        dateTimeFmtS.setTimeZone(DateUtils.UTC);
+        dateTimeFmtL.setTimeZone(DateUtils.UTC);
+    }
+
+    private Date parseDate(String date) throws ParseException {
+        return (date.length() > 20 ? dateTimeFmtL : dateTimeFmtS).parse(date);
     }
 
@@ -84 +91 @@
                                     Double.parseDouble(fields[IDX_LON])));
                             currentwp.put(GpxConstants.PT_ELE, fields[IDX_HEIGHT]);
-                            currentwp.setTime(dateTimeFmt.parse(fields[IDX_DATE]+" "+fields[IDX_TIME]));
+                            currentwp.setTime(parseDate(fields[IDX_DATE]+" "+fields[IDX_TIME]));
                             currentwp.put(GpxConstants.RTKLIB_Q, Integer.parseInt(fields[IDX_Q]));
                             currentwp.put(GpxConstants.PT_SAT, fields[IDX_NS]);

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -19 +20 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.date.DateUtils;
+import org.xml.sax.SAXException;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -43 +45 @@
     }
 
+    private static RtkLibPosReader read(String path) throws IOException, SAXException {
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        RtkLibPosReader in = new RtkLibPosReader(Files.newInputStream(Paths.get(path)));
+        in.parse(true);
+        return in;
+    }
+
     /**
      * Tests reading a RTKLib pos file.
@@ -49 +58 @@
     @Test
     public void testReader() throws Exception {
-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
-        RtkLibPosReader in = new RtkLibPosReader(Files.newInputStream(Paths.get("data_nodist/rtklib_example.pos")));
-        in.parse(true);
+        RtkLibPosReader in = read("data_nodist/rtklib_example.pos");
         assertEquals(137, in.getNumberOfCoordinates());
 
@@ -70 +77 @@
         assertEquals("2.2090015", wayPoints.get(0).get(GpxConstants.PT_HDOP).toString().trim());
     }
+
+    /**
+     * Tests reading another RTKLib pos file with different date format.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testReader2() throws Exception {
+        RtkLibPosReader in = read("data_nodist/rtklib_example2.pos");
+        assertEquals(6, in.getNumberOfCoordinates());
+    }
 }