Changeset 19325 in josm for trunk/src/org

Timestamp:

2025-02-16T13:21:38+01:00 (4 weeks ago)

Author:

stoecker

Message:

fix #21007, fix failing unit test, patch by StephaneP

File:

• trunk/src/org/openstreetmap/josm/io/nmea/NmeaParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/nmea/NmeaParser.java

@@ -335 +335 @@
                 }
             } else {
+                // Since there is no checksum, we remove any line endings
+                chkstrings[0] = chkstrings[0].replaceAll("\\r|\\n", "");
                 noChecksum++;
             }
@@ -444 +446 @@
                 }
                 // Age of differential correction
-                accu = e[GGA.GPS_AGE.position];
-                if (!accu.isEmpty() && currentwp != null) {
-                    currentwp.put(GpxConstants.PT_AGEOFDGPSDATA, Float.valueOf(accu));
+                if (GGA.GPS_AGE.position < e.length) {
+                    accu = e[GGA.GPS_AGE.position];
+                    if (!accu.isEmpty() && currentwp != null) {
+                        currentwp.put(GpxConstants.PT_AGEOFDGPSDATA, Float.valueOf(accu));
+                    }
                 }
                 // reference ID