Changeset 6775 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-01-29T22:26:53+01:00 (10 years ago)

Author:

simon04

Message:

fix #9600 - GpxLayer: use neutral track color if speed is zero (velocity mode) or time extent is very short (time mode)

File:

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

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

@@ -575 +575 @@
                                 int velColor =(int) Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
                                         : (vel <= 0 ? 0 : vel / colorTracksTune * 255));
-                                trkPnt.customColoring = colors[Math.max(0, Math.min(velColor, 255))];
+                                final int vIndex = Math.max(0, Math.min(velColor, 255));
+                                trkPnt.customColoring = vIndex == 255 ? neutralColor : colors[vIndex];
                             } else {
-                                trkPnt.customColoring = colors[255];
+                                trkPnt.customColoring = neutralColor;
                             }
                             break;
@@ -591 +592 @@
                         case time:
                             double t=trkPnt.time;
-                            if (t>0 && t<=now){ // skip bad timestamps
+                            if (t > 0 && t <= now && maxval - minval > 1000) { // skip bad timestamps and very short tracks
                                 int tColor = (int) Math.round((t-minval)*255/(maxval-minval));
                                 trkPnt.customColoring = colors[tColor];