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

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19325 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Feb 16, 2025 · d025105 · d025105
1 parent 106fd3a
commit d025105
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/org/openstreetmap/josm/io/nmea/NmeaParser.java b/src/org/openstreetmap/josm/io/nmea/NmeaParser.java
@@ -334,6 +334,8 @@ public boolean parseNMEASentence(String s) throws IllegalDataException {
                     return false;
                 }
             } else {
+                // Since there is no checksum, we remove any line endings
+                chkstrings[0] = chkstrings[0].replaceAll("\\r|\\n", "");
                 noChecksum++;
             }
             // now for the content
@@ -443,9 +445,11 @@ public boolean parseNMEASentence(String s) throws IllegalDataException {
                     }
                 }
                 // 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
                 if (GGA.REF.position < e.length) {