Changeset 17839 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-05-01T12:37:41+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - RtkLibPosReader: parse timestamps using DateUtils

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/rtklib/RtkLibPosReader.java (modified) (5 diffs)
• tools/date/DateUtils.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
-import java.util.Locale;
 import java.util.Objects;
 
@@ -50 +46 @@
     private static final int IDX_RATIO = 14;
 
-    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;
     private GpxData data;
@@ -64 +57 @@
     public RtkLibPosReader(InputStream source) throws IOException {
         this.source = Objects.requireNonNull(source);
-        dateTimeFmtS.setTimeZone(DateUtils.UTC);
-        dateTimeFmtL.setTimeZone(DateUtils.UTC);
-    }
-
-    private Date parseDate(String date) throws ParseException {
-        return (date.length() > 20 ? dateTimeFmtL : dateTimeFmtS).parse(date);
     }
 
@@ -91 +78 @@
                                     Double.parseDouble(fields[IDX_LON])));
                             currentwp.put(GpxConstants.PT_ELE, fields[IDX_HEIGHT]);
-                            currentwp.setInstant(parseDate(fields[IDX_DATE]+" "+fields[IDX_TIME]).toInstant());
+                            currentwp.setInstant(DateUtils.parseInstant(fields[IDX_DATE]+" "+fields[IDX_TIME]));
                             currentwp.put(GpxConstants.RTKLIB_Q, Integer.parseInt(fields[IDX_Q]));
                             currentwp.put(GpxConstants.PT_SAT, fields[IDX_NS]);
@@ -107 +94 @@
                             waypoints.add(currentwp);
                             success++;
-                        } catch (ParseException | IllegalArgumentException e) {
+                        } catch (IllegalArgumentException e) {
                             Logging.error(e);
                         }

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

@@ -91 +91 @@
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx") ||
                 checkLayout(str, "xxxx:xx:xx xx:xx:xx") ||
+                checkLayout(str, "xxxx/xx/xx xx:xx:xx") ||
                 checkLayout(str, "xxxx-xx-xx xx:xx:xxZ") ||
                 checkLayout(str, "xxxx-xx-xx xx:xx:xx UTC") ||
@@ -115 +116 @@
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx") ||
                 checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ||
+                checkLayout(str, "xxxx/xx/xx xx:xx:xx.xxx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx-xx:00")) {