Changeset 32717 in osm

Timestamp:

2016-07-26T16:15:45+02:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Update sequence colors to match the mapillary website

Location:

applications/editors/josm/plugins/mapillary

Files:

• config/josm/preferences.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryColorScheme.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/config/josm/preferences.xml

@@ -6 +6 @@
     <entry value='apache-http'/>
   </list>
+  <tag key='mapillary.developer' value='true'/>
   <tag key='pluginmanager.time-based-update.policy' value='never'/>
   <tag key='pluginmanager.version-based-update.policy' value='never'/>

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -61 +61 @@
 import org.openstreetmap.josm.plugins.mapillary.mode.SelectMode;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapViewGeometryUtil;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryColorScheme;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
@@ -334 +335 @@
     // Draw sequence line
     final MapillaryAbstractImage selectedImage = MapillaryLayer.getInstance().getData().getSelectedImage();
-    String selectedImageKey = null; // Intentionally not null to avoid null-check before .equals()
+    String selectedImageKey = null;
     if (selectedImage != null && selectedImage.getSequence() != null) {
       selectedImageKey = selectedImage.getSequence().getKey();
@@ -341 +342 @@
     for (MapillarySequence seq : getData().getSequences()) {
       if (selectedImageKey != null && selectedImageKey.equals(seq.getKey())) {
-        g.setColor(Color.MAGENTA.brighter());
+        g.setColor(MapillaryColorScheme.SEQ_SELECTED);
       } else {
-        g.setColor(Color.WHITE);
+        g.setColor(MapillaryColorScheme.SEQ_UNSELECTED);
       }
       g.draw(MapViewGeometryUtil.getSequencePath(mv, seq));

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryColorScheme.java

@@ -13 +13 @@
 
 public final class MapillaryColorScheme {
+  public static final Color SEQ_UNSELECTED = new Color(0x37a860);
+  public static final Color SEQ_UNSELECTED_VIEW = new Color(0x177542);
+  public static final Color SEQ_SELECTED = new Color(0x00b5f5);
+  public static final Color SEQ_SELECTED_VIEW = new Color(0x00769d);
+  public static final Color SEQ_HIGHLIGHTED_IMAGE = new Color(0xf5811a);
+  public static final Color SEQ_HIGHLIGHTED_IMG_VIEW = new Color(0xf5b81a);
+
   public static final Color MAPILLARY_GREEN = new Color(0x35af6d);
   public static final Color TOOLBAR_DARK_GREY = new Color(0x242528);