Changeset 1381 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-02-08T11:58:57+01:00 (15 years ago)

Author:

stoecker

Message:

close #2147

File:

• trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -136 +136 @@
     private final static SimpleDateFormat RMCTIMEFMT =
         new SimpleDateFormat("ddMMyyHHmmss.SSS");
+    private final static SimpleDateFormat RMCTIMEFMTSTD =
+        new SimpleDateFormat("ddMMyyHHmmss");
+
+    private Date readTime(String p)
+    {
+        Date d = RMCTIMEFMT.parse(p, new ParsePosition(0));
+        if (d == null)
+            d = RMCTIMEFMTSTD.parse(p, new ParsePosition(0));
+        if (d == null) throw(null); // malformed
+        return d;
+    }
 
     // functons for reading the error stats
@@ -258 +269 @@
                 // time
                 accu = e[GPGGA.TIME.position];
-                Date d = RMCTIMEFMT.parse(currentDate+accu, new ParsePosition(0));
-                if (d == null) throw(null); // malformed
+                Date d = readTime(currentDate+accu);
 
                 if((ps.p_Time==null) || (currentwp==null) || !ps.p_Time.equals(accu)) {
@@ -376 +386 @@
                 String time = e[GPRMC.TIME.position];
 
-                Date d = RMCTIMEFMT.parse(currentDate+time, new ParsePosition(0));
-                if (d == null) throw(null);
+                Date d = readTime(currentDate+time);
 
                 if((ps.p_Time==null) || (currentwp==null) || !ps.p_Time.equals(time)) {
@@ -426 +435 @@
         } catch(Exception x) {
             // out of bounds and such
-            //System.out.println("Malformed line: "+s.toString().trim());
+            // System.out.println("Malformed line: "+s.toString().trim());
             ps.malformed++;
             ps.p_Wp=null;