Changeset 7518 in josm for trunk/src/org/openstreetmap/josm/io/NmeaReader.java

Timestamp:

2014-09-10T02:29:55+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10489 - Add additional attributes to GPX Export for nodes + GPX code improvements

File:

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

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

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
@@ -287 +288 @@
                     // As this sentence has no complete time only use it
                     // if there is no time so far
-                    currentwp.attr.put("time", DateUtils.fromDate(d));
+                    currentwp.put(GpxConstants.PT_TIME, DateUtils.fromDate(d));
                 }
                 // elevation
@@ -299 +300 @@
                         // device sends nonstandard data.
                         if(!accu.isEmpty()) { // FIX ? same check
-                            currentwp.attr.put("ele", accu);
+                            currentwp.put(GpxConstants.PT_ELE, accu);
                         }
                     }
@@ -308 +309 @@
                 if(!accu.isEmpty()) {
                     sat = Integer.parseInt(accu);
-                    currentwp.attr.put("sat", accu);
+                    currentwp.put(GpxConstants.PT_SAT, accu);
                 }
                 // h-dilution
                 accu=e[GPGGA.HDOP.position];
                 if(!accu.isEmpty()) {
-                    currentwp.attr.put("hdop", Float.parseFloat(accu));
+                    currentwp.put(GpxConstants.PT_HDOP, Float.parseFloat(accu));
                 }
                 // fix
@@ -321 +322 @@
                     switch(fixtype) {
                     case 0:
-                        currentwp.attr.put("fix", "none");
+                        currentwp.put(GpxConstants.PT_FIX, "none");
                         break;
                     case 1:
                         if(sat < 4) {
-                            currentwp.attr.put("fix", "2d");
+                            currentwp.put(GpxConstants.PT_FIX, "2d");
                         } else {
-                            currentwp.attr.put("fix", "3d");
+                            currentwp.put(GpxConstants.PT_FIX, "3d");
                         }
                         break;
                     case 2:
-                        currentwp.attr.put("fix", "dgps");
+                        currentwp.put(GpxConstants.PT_FIX, "dgps");
                         break;
                     default:
@@ -345 +346 @@
                     if(!accu.isEmpty()) {
                         Double.parseDouble(accu);
-                        currentwp.attr.put("course", accu);
+                        currentwp.put("course", accu);
                     }
                 }
@@ -355 +356 @@
                         double speed = Double.parseDouble(accu);
                         speed /= 3.6; // speed in m/s
-                        currentwp.attr.put("speed", Double.toString(speed));
+                        currentwp.put("speed", Double.toString(speed));
                     }
                 }
@@ -362 +363 @@
                 accu=e[GPGSA.VDOP.position];
                 if(!accu.isEmpty()) {
-                    currentwp.attr.put("vdop", Float.parseFloat(accu));
+                    currentwp.put(GpxConstants.PT_VDOP, Float.parseFloat(accu));
                 }
                 // hdop
                 accu=e[GPGSA.HDOP.position];
                 if(!accu.isEmpty()) {
-                    currentwp.attr.put("hdop", Float.parseFloat(accu));
+                    currentwp.put(GpxConstants.PT_HDOP, Float.parseFloat(accu));
                 }
                 // pdop
                 accu=e[GPGSA.PDOP.position];
                 if(!accu.isEmpty()) {
-                    currentwp.attr.put("pdop", Float.parseFloat(accu));
+                    currentwp.put(GpxConstants.PT_PDOP, Float.parseFloat(accu));
                 }
             }
@@ -399 +400 @@
                 }
                 // time: this sentence has complete time so always use it.
-                currentwp.attr.put("time", DateUtils.fromDate(d));
+                currentwp.put(GpxConstants.PT_TIME, DateUtils.fromDate(d));
                 // speed
                 accu = e[GPRMC.SPEED.position];
@@ -405 +406 @@
                     double speed = Double.parseDouble(accu);
                     speed *= 0.514444444; // to m/s
-                    currentwp.attr.put("speed", Double.toString(speed));
+                    currentwp.put("speed", Double.toString(speed));
                 }
                 // course
@@ -411 +412 @@
                 if(!accu.isEmpty() && !currentwp.attr.containsKey("course")) {
                     Double.parseDouble(accu);
-                    currentwp.attr.put("course", accu);
+                    currentwp.put("course", accu);
                 }