Ticket #6540: gpx_color_direction.2--color-mod.patch

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

@@ -77 +77 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.UrlLabel;
+import org.openstreetmap.josm.tools.Utils;
 
 public class GpxLayer extends Layer {
 
@@ -310 +311 @@
         }
     }
 
+    private final static Color[] colors_cyclic = new Color[256];
+    static {
+        for (int i = 0; i < colors_cyclic.length; i++) {
+            //                    red   yellow  green   blue    red
+            int[] h = new int[] { 0,    59,     127,    244,    360};
+            int[] s = new int[] { 100,  84,     99,     100 };
+            int[] b = new int[] { 90,   93,     74,     83 };
+
+            float angle = i / 256f * 4;
+            int sector = (int) angle;
+            angle -= sector;
+            sector = Utils.mod(sector+1, 4);
+
+            float vh = h[sector] * w(angle) + h[sector+1] * w(1-angle);
+            float vs = s[sector] * w(angle) + s[Utils.mod(sector+1, 4)] * w(1-angle);
+            float vb = b[sector] * w(angle) + b[Utils.mod(sector+1, 4)] * w(1-angle);
+
+            colors_cyclic[i] = Color.getHSBColor(vh/360f, vs/100f, vb/100f);
+        }
+    }
+
+    /**
+     * weight function: 
+     *  w(0)=1, w(1)=0, 0<=w(x)<=1, w(x)+w(1-x)==1
+     * @param x number: 0<=x<=1
+     * @return the weighted value
+     */
+    private static float w(float x) {
+        if (x < 0.5) {
+            return 1-4*x*x*x;
+        } else {
+            return 4*(1-x)*(1-x)*(1-x);
+        }
+    }
+    
     // lookup array to draw arrows without doing any math
     private static int ll0 = 9;
     private static int sl4 = 5;
@@ -321 +357 @@
 
     // the different color modes
     enum colorModes {
-        none, velocity, dilution
+        none, velocity, dilution, direction
     }
 
     @Override
@@ -429 +465 @@
                                 }
                                 break;
 
+                            case direction:
+                                // unfortunately "heading" misses a cos-factor in the
+                                // longitudes to account for the convergence of meridians
+                                double dirColor = oldWp.getCoor().heading(trkPnt.getCoor()) / (2.0 * Math.PI) * 256;
+                                // Bad case first
+                                if (dirColor != dirColor || dirColor < 0.0 || dirColor >= 256.0) {
+                                    trkPnt.customColoring = colors_cyclic[0];
+                                } else {
+                                    trkPnt.customColoring = colors_cyclic[(int) (dirColor)];
+                                }
+                                break;
                             case dilution:
                                 if (trkPnt.attr.get("hdop") != null) {
                                     float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();

src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -44 +44 @@
     private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle form HDOP value."));
     private ButtonGroup colorGroup;
     private JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
+    private JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = north, purple = west)"));
     private JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
     private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
     private JComboBox colorTypeVelocityTune = new JComboBox(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
@@ -169 +170 @@
         colorGroup = new ButtonGroup();
         colorGroup.add(colorTypeNone);
         colorGroup.add(colorTypeVelocity);
+        colorGroup.add(colorTypeDirection);
         colorGroup.add(colorTypeDilution);
 
         colorTypeVelocity.addChangeListener(new ChangeListener(){
@@ -187 +189 @@
         case 2:
             colorTypeDilution.setSelected(true);
             break;
+        case 3:
+            colorTypeDirection.setSelected(true);
+            break;
         }
 
         colorTypeNone.setToolTipText(tr("All points and track segments will have the same color. Can be customized in Layer Manager."));
         colorTypeVelocity.setToolTipText(tr("Colors points and track segments by velocity."));
+        colorTypeDirection.setToolTipText(tr("Colors points and track segments by direction."));
         colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."));
 
         // color Tracks by Velocity Tune
@@ -205 +211 @@
         panel.add(colorTypeNone, GBC.eol().insets(40,0,0,0));
         panel.add(colorTypeVelocity, GBC.std().insets(40,0,0,0));
         panel.add(colorTypeVelocityTune, GBC.eop().insets(5,0,0,5));
+        panel.add(colorTypeDirection, GBC.eol().insets(40,0,0,0));
         panel.add(colorTypeDilution, GBC.eol().insets(40,0,0,0));
 
         // waypointLabel
@@ -299 +306 @@
             Main.pref.putInteger("draw.rawgps.colors", 1);
         } else if(colorTypeDilution.isSelected()) {
             Main.pref.putInteger("draw.rawgps.colors", 2);
+        } else if(colorTypeDirection.isSelected()) {
+            Main.pref.putInteger("draw.rawgps.colors", 3);
         } else {
             Main.pref.putInteger("draw.rawgps.colors", 0);
         }