Ticket #20600: 20600.patch

src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -132 +132 @@
     /** Colors (without custom alpha channel, if given) for HDOP painting. **/
     private ColorScale hdopScale;
     private ColorScale qualityScale;
+    private ColorScale fixScale;
     private ColorScale dateScale;
     private ColorScale directionScale;
 
@@ -190 +191 @@
         Color.CYAN // PPP
     };
 
+    private static final String[] rtkLibQualityNames = {
+            "1 - Fixed",
+            "2 - Float",
+            "3 - Reserved",
+            "4 - DGPS",
+            "5 - Single",
+            "6 - PPP"
+    };
+
+    /**
+     *  @see GpxConstants#FIX_VALUES
+     */
+    private static final Color[] gpsFixQualityColors = {
+            Color.MAGENTA, //None
+            new Color(255, 125, 0), //2D (orange-red)
+            Color.ORANGE, //3D
+            Color.CYAN, //DGPS
+            new Color(150, 255, 150), //PPS (light-green)
+            Color.GREEN, //RTK
+            Color.YELLOW, //Float RTK
+            Color.RED, //Estimated
+            Color.BLUE, //Manual
+            Color.GRAY //Simulated
+    };
+
+    private static final String[] gpsFixQualityNames = {
+            "None",
+            "2D",
+            "3D",
+            "DGPS",
+            "PPS",
+            "RTK",
+            "Float RTK",
+            "Estimated",
+            "Manual",
+            "Simulated"
+    };
+
     // user defined heatmap color
     private Color[] heatMapLutColor = createColorLut(0, Color.BLACK, Color.WHITE);
 
@@ -201 +240 @@
         velocityScale = ColorScale.createHSBScale(256);
         /** Colors (without custom alpha channel, if given) for HDOP painting. **/
         hdopScale = ColorScale.createHSBScale(256).makeReversed().addTitle(tr("HDOP"));
-        qualityScale = ColorScale.createFixedScale(rtkLibQualityColors).addTitle(tr("Quality"));
+        qualityScale = ColorScale.createFixedScale(rtkLibQualityColors).addTitle(tr("Quality")).addColorBarTitles(rtkLibQualityNames);
+        fixScale = ColorScale.createFixedScale(gpsFixQualityColors).addTitle(tr("GPS Fix")).addColorBarTitles(gpsFixQualityNames);
         dateScale = ColorScale.createHSBScale(256).addTitle(tr("Time"));
         directionScale = ColorScale.createCyclicScale(256).setIntervalCount(4).addTitle(tr("Direction"));
 
@@ -246 +286 @@
         /**
          * Color by quality (RTKLib)
          */
-        QUALITY;
+        QUALITY,
+        /**
+         * Color by GPS fix
+         */
+        FIX;
 
         static ColorMode fromIndex(final int index) {
             return values()[index];
@@ -347 +391 @@
         dateScale.setNoDataColor(neutralColor);
         hdopScale.setNoDataColor(neutralColor);
         qualityScale.setNoDataColor(neutralColor);
+        fixScale.setNoDataColor(neutralColor);
         directionScale.setNoDataColor(neutralColor);
 
         largesize += lineWidth;
@@ -562 +607 @@
             velocityScale.setRange(0, velocityTune);
             hdopScale.setRange(0, hdoprange);
             qualityScale.setRange(1, rtkLibQualityColors.length);
+            fixScale.setRange(0, gpsFixQualityColors.length);
         }
         double now = System.currentTimeMillis()/1000.0;
         if (colored == ColorMode.TIME) {
@@ -589 +635 @@
                     color = hdopScale.getColor((Float) trkPnt.get(GpxConstants.PT_HDOP));
                 } else if (colored == ColorMode.QUALITY) {
                     color = qualityScale.getColor((Integer) trkPnt.get(GpxConstants.RTKLIB_Q));
+                } else if (colored == ColorMode.FIX) {
+                    Object fixval = trkPnt.get(GpxConstants.PT_FIX);
+                    if (fixval != null) {
+                        int fix = GpxConstants.FIX_VALUES.indexOf(fixval);
+                        if (fix >= 0) {
+                            color = fixScale.getColor(fix);
+                        }
+                    }
                 }
                 if (oldWp != null) { // other coloring modes need segment for calcuation
                     double dist = c.greatCircleDistance(oldWp.getCoor());
@@ -1516 +1570 @@
             hdopScale.drawColorBar(g, w-30, 50, 20, 100, 1.0);
         } else if (colored == ColorMode.QUALITY) {
             qualityScale.drawColorBar(g, w-30, 50, 20, 100, 1.0);
+        } else if (colored == ColorMode.FIX) {
+            fixScale.drawColorBar(g, w-30, 50, 20, 175, 1.0);
         } else if (colored == ColorMode.VELOCITY) {
             SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();
             velocityScale.drawColorBar(g, w-30, 50, 20, 100, som.speedValue);

src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -70 +70 @@
     private final JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
     private final JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
     private final JRadioButton colorTypeQuality = new JRadioButton(tr("Quality (RTKLib only, if available)"));
+    private final JRadioButton colorTypeFix = new JRadioButton(tr("GPS fix value"));
     private final JRadioButton colorTypeTime = new JRadioButton(tr("Track date"));
     private final JRadioButton colorTypeHeatMap = new JRadioButton(tr("Heat Map (dark = few, bright = many)"));
     private final JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized in the layer manager)"));
@@ -452 +453 @@
         colorGroup.add(colorTypeDirection);
         colorGroup.add(colorTypeDilution);
         colorGroup.add(colorTypeQuality);
+        colorGroup.add(colorTypeFix);
         colorGroup.add(colorTypeTime);
         colorGroup.add(colorTypeHeatMap);
 
@@ -462 +464 @@
                 tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."));
         colorTypeQuality.setToolTipText(
                 tr("Colors points and track segments by RTKLib quality flag (Q). Your capture device needs to log that information."));
+        colorTypeFix.setToolTipText(tr("Colors points and track segments by GPS fix value."));
         colorTypeTime.setToolTipText(tr("Colors points and track segments by its timestamp."));
         colorTypeHeatMap.setToolTipText(tr("Collected points and track segments for a position and displayed as heat map."));
 
@@ -483 +486 @@
         add(colorTypeDirection, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeDilution, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeQuality, GBC.eol().insets(40, 0, 0, 0));
+        add(colorTypeFix, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeTime, GBC.eol().insets(40, 0, 0, 0));
         add(colorTypeHeatMap, GBC.std().insets(40, 0, 0, 0));
         add(colorTypeHeatIconLabel, GBC.std().insets(5, 0, 0, 5));
@@ -636 +640 @@
             case 4: colorTypeTime.setSelected(true); break;
             case 5: colorTypeHeatMap.setSelected(true); break;
             case 6: colorTypeQuality.setSelected(true); break;
+            case 7: colorTypeFix.setSelected(true); break;
             default: Logging.warn("Unknown color type: " + colorType);
             }
             int ccts = prefInt("colormode.velocity.tune");
@@ -712 +717 @@
             putPref("colormode", 5);
         } else if (colorTypeQuality.isSelected()) {
             putPref("colormode", 6);
+            } else if (colorTypeFix.isSelected()) {
+                putPref("colormode", 7);
         } else {
             putPref("colormode", 0);
         }

src/org/openstreetmap/josm/io/GpxReader.java

@@ -464 +464 @@
                 case "urlname":
                 case "cmt":
                 case "desc":
+                case "fix":
                     currentWayPoint.put(localName, accumulator.toString());
                     break;
                 case "hdop":

src/org/openstreetmap/josm/tools/ColorScale.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
+import java.util.Arrays;
 
 /**
  * Utility class that helps to work with color scale for coloring GPX tracks etc.
@@ -16 +17 @@
     private Color aboveMaxColor;
 
     private Color[] colors;
+    private String[] colorBarTitles;
     private String title = "";
     private int intervalCount = 5;
 
@@ -182 +184 @@
         return this;
     }
 
+    public ColorScale addColorBarTitles(String[] titles) {
+        this.intervalCount = titles.length - 1;
+        this.colorBarTitles = titles;
+        return this;
+    }
+
     /**
      * Sets the interval count for this scale
      * @param intervalCount The interval count hint
@@ -234 +242 @@
         int fw, fh;
         FontMetrics fm = g.getFontMetrics();
         fh = fm.getHeight()/2;
-        fw = fm.stringWidth(String.valueOf(Math.max((int) Math.abs(max*valueScale),
-                (int) Math.abs(min*valueScale)))) + fm.stringWidth("0.123");
+        if (colorBarTitles != null && colorBarTitles.length > 0) {
+            fw = Arrays.asList(colorBarTitles).stream().mapToInt(title -> fm.stringWidth(title)).max().orElse(50);
+        } else {
+            fw = fm.stringWidth(
+                    String.valueOf(Math.max((int) Math.abs(max * valueScale), (int) Math.abs(min * valueScale))))
+                    + fm.stringWidth("0.123");
+        }
         g.setColor(noDataColor);
         if (title != null) {
             g.drawString(title, x-fw-3, y-fh*3/2);
@@ -242 +255 @@
         }
         for (int i = 0; i <= intervalCount; i++) {
             g.setColor(colors[(int) (1.0*i*n/intervalCount-1e-10)]);
-            final double val = min+i*(max-min)/intervalCount;
-            final String txt = String.format("%.3f", val*valueScale);
+            String txt;
+            if (colorBarTitles != null && i < colorBarTitles.length) {
+                txt = colorBarTitles[i];
+            } else {
+                final double val = min+i*(max-min)/intervalCount;
+                txt = String.format("%.3f", val*valueScale);
+            }
             if (w < h) {
                 g.drawString(txt, x-fw-3, y+i*h/intervalCount+fh/2);
             } else {

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

@@ -3 +3 @@
 
 import java.awt.Color;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -252 +251 @@
     /**
      * Possible fix values. NMEA 0183 Version 4.00
      */
-    Collection<String> FIX_VALUES = Collections.unmodifiableList(
+    List<String> FIX_VALUES = Collections.unmodifiableList(
             Arrays.asList("none", "2d", "3d", "dgps", "pps", "rtk", "float rtk", "estimated", "manual", "simulated"));
 
     /**