Changeset 15249 in josm for trunk/src/org

Timestamp:

2019-07-14T15:12:39+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17829 - fix gpx conversion issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxConstants.java (modified) (1 diff)
• gui/layer/gpx/ConvertFromGpxLayerAction.java (modified) (1 diff)

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

@@ -199 +199 @@
      * The ratio factor of ʺratio‐testʺ for standard integer ambiguity validation strategy.
      * The value means the ratio of the squared sum of the residuals with the second best integer vector to with the best integer vector. */
-    String RTKLIB_RATIO = "ration";
+    String RTKLIB_RATIO = "ratio";
 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java

@@ -68 +68 @@
                         String key = entry.getKey();
                         Object obj = p.get(key);
-                        if (check && !keys.contains(key) && (obj instanceof String || obj instanceof Date)) {
+                        if (check && !keys.contains(key) && (obj instanceof String || obj instanceof Number || obj instanceof Date)) {
                             keys.add(key);
                         }
-                        if (obj instanceof String) {
-                            String str = (String) obj;
-                            if (!none) {
-                                // only convert when required
-                                n.put(key, str);
-                            }
+                        if (!none && (obj instanceof String || obj instanceof Number)) {
+                            // only convert when required
+                            n.put(key, obj.toString());
                         } else if (obj instanceof Date && GpxConstants.PT_TIME.equals(key)) {
                             // timestamps should always be converted