Changeset 18753 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2023-06-13T22:36:12+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #23001: ClassCastException in GpxDrawHelper#calculateColors

This occurs when a working GPX file with HDOP information is converted to an OSM
Data Layer and back to a GPX Data Layer. This is fixed by (a) converting casts
for get operations to Number instead of Float/Integer and (b) actually
putting the number in the attribute map instead of a string.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -945 +945 @@
         if (value != null) {
             try {
-                int i = Integer.parseInt(value);
+                final int i = Integer.parseInt(value);
                 // Sanity checks
                 if ((!GpxConstants.PT_SAT.equals(gpxKey) || i >= 0) &&
                         (!GpxConstants.PT_DGPSID.equals(gpxKey) || (0 <= i && i <= 1023))) {
-                    wpt.put(gpxKey, value);
+                    wpt.put(gpxKey, i);
                 }
             } catch (NumberFormatException e) {
@@ -964 +964 @@
         if (value != null) {
             try {
-                double d = Double.parseDouble(value);
+                final double d = Double.parseDouble(value);
                 // Sanity checks
                 if (!GpxConstants.PT_MAGVAR.equals(gpxKey) || (0.0 <= d && d < 360.0)) {
-                    wpt.put(gpxKey, value);
+                    wpt.put(gpxKey, d);
                 }
             } catch (NumberFormatException e) {