Changeset 12422 in josm for trunk/src/org/openstreetmap/josm/io/nmea

Timestamp:

2017-06-22T01:07:31+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14924 - fix NPE when reading NMEA files starting with a (0,0) coordinate followed by a VTG sentence

File:

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

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

@@ -342 +342 @@
                     // other values than (T)rue are ignored
                     accu = e[VTG.COURSE.position];
-                    if (!accu.isEmpty()) {
+                    if (!accu.isEmpty() && currentwp != null) {
                         Double.parseDouble(accu);
                         currentwp.put("course", accu);
@@ -351 +351 @@
                 if (accu.startsWith("K")) {
                     accu = e[VTG.SPEED_KMH.position];
-                    if (!accu.isEmpty()) {
+                    if (!accu.isEmpty() && currentwp != null) {
                         double speed = Double.parseDouble(accu);
                         speed /= 3.6; // speed in m/s