Changeset 3994 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Timestamp:

2011-03-18T00:22:13+01:00 (13 years ago)

Author:

mjulius

Message:

fix #6113 - removing "mandatory" arrows on some types of ways
Since oneway arrows are now different from way direction arrows they need to be treated separately.
They now can be turned on and off independently.

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintSettings.java (modified) (4 diffs)
• SimplePaintVisitor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -14 +14 @@
     private boolean useRealWidth;
     private boolean showDirectionArrow;
-    private boolean showRelevantDirectionsOnly;
+    private boolean showOnewayArrow;
     private int defaultSegmentWidth;
     private boolean showOrderNumber;
@@ -46 +46 @@
     private void load() {
         showDirectionArrow = Main.pref.getBoolean("draw.segment.direction", true);
-        showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only", true);
+        showOnewayArrow = Main.pref.getBoolean("draw.oneway", true);
         useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth", false);
         defaultSegmentWidth = Main.pref.getInteger("mappaint.segment.default-width", 2);
@@ -81 +81 @@
 
         outlineOnly = Main.pref.getBoolean("draw.data.area_outline_only", false);
-        
+
     }
 
@@ -96 +96 @@
     }
 
-    public boolean isShowRelevantDirectionsOnly() {
-        return showRelevantDirectionsOnly;
+    public boolean isShowOnewayArrow() {
+        return showOnewayArrow;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java

@@ -63 +63 @@
     protected Color taggedConnectionColor;
     protected boolean showDirectionArrow;
-    protected boolean showRelevantDirectionsOnly;
+    protected boolean showOnewayArrow;
     protected boolean showHeadArrowOnly;
     protected boolean showOrderNumber;
@@ -109 +109 @@
         MapPaintSettings settings = MapPaintSettings.INSTANCE;
         showDirectionArrow = settings.isShowDirectionArrow();
-        showRelevantDirectionsOnly = settings.isShowRelevantDirectionsOnly();
+        showOnewayArrow = settings.isShowOnewayArrow();
         showHeadArrowOnly = settings.isShowHeadArrowOnly();
         showOrderNumber = settings.isShowOrderNumber();
@@ -333 +333 @@
            (even if the tag is negated as in oneway=false) or the way is selected */
 
-        boolean showThisDirectionArrow = ds.isSelected(w)
-        || (showDirectionArrow && (!showRelevantDirectionsOnly || w.hasDirectionKeys()));
+        boolean showThisDirectionArrow = ds.isSelected(w) || showDirectionArrow;
         /* head only takes over control if the option is true,
            the direction should be shown at all and not only because it's selected */