Changeset 15249 in josm


Ignore:
Timestamp:
2019-07-14T15:12:39+02:00 (6 weeks ago)
Author:
Don-vip
Message:

see #17829 - fix gpx conversion issues

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java

    r15247 r15249  
    199199     * The ratio factor of ʺratio‐testʺ for standard integer ambiguity validation strategy.
    200200     * The value means the ratio of the squared sum of the residuals with the second best integer vector to with the best integer vector. */
    201     String RTKLIB_RATIO = "ration";
     201    String RTKLIB_RATIO = "ratio";
    202202}
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java

    r14459 r15249  
    6868                        String key = entry.getKey();
    6969                        Object obj = p.get(key);
    70                         if (check && !keys.contains(key) && (obj instanceof String || obj instanceof Date)) {
     70                        if (check && !keys.contains(key) && (obj instanceof String || obj instanceof Number || obj instanceof Date)) {
    7171                            keys.add(key);
    7272                        }
    73                         if (obj instanceof String) {
    74                             String str = (String) obj;
    75                             if (!none) {
    76                                 // only convert when required
    77                                 n.put(key, str);
    78                             }
     73                        if (!none && (obj instanceof String || obj instanceof Number)) {
     74                            // only convert when required
     75                            n.put(key, obj.toString());
    7976                        } else if (obj instanceof Date && GpxConstants.PT_TIME.equals(key)) {
    8077                            // timestamps should always be converted
Note: See TracChangeset for help on using the changeset viewer.