Changeset 15018 in josm for trunk

Timestamp:

2019-04-25T10:11:56+02:00 (5 years ago)

Author:

stoecker

Message:

add missing NMEA fix types from NMEA 4.00

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxConstants.java (modified) (1 diff)
• io/nmea/NmeaReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java

@@ -161 +161 @@
 
     /**
-     * Possible fix values.
+     * Possible fix values. NMEA 0183 Version 4.00
      */
-    Collection<String> FIX_VALUES = Collections.unmodifiableList(Arrays.asList("none", "2d", "3d", "dgps", "pps"));
+    Collection<String> FIX_VALUES = Collections.unmodifiableList(Arrays.asList("none", "2d", "3d", "dgps", "pps","rtk", "float rtk", "estimated", "manual", "simulated"));
 }

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

@@ -411 +411 @@
                         currentwp.put(GpxConstants.PT_FIX, "dgps");
                         break;
+                    case 3:
+                        currentwp.put(GpxConstants.PT_FIX, "pps");
+                        break;
+                    case 4:
+                        currentwp.put(GpxConstants.PT_FIX, "rtk");
+                        break;
+                    case 5:
+                        currentwp.put(GpxConstants.PT_FIX, "float rtk");
+                        break;
+                    case 6:
+                        currentwp.put(GpxConstants.PT_FIX, "estimated");
+                        break;
+                    case 7:
+                        currentwp.put(GpxConstants.PT_FIX, "manual");
+                        break;
+                    case 8:
+                        currentwp.put(GpxConstants.PT_FIX, "simulated");
+                        break;
                     default:
                         break;