Changeset 3994 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

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.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -121 +121 @@
                 }
             }
-            if (!hasPositive || dashes.length == 0) {
+            if (!hasPositive || (dashes != null && dashes.length == 0)) {
                 dashes = null;
             }
@@ -198 +198 @@
         the way is tagged with a direction key
         (even if the tag is negated as in oneway=false) or the way is selected */
-        boolean showOrientation = !isModifier && selected && !paintSettings.isUseRealWidth();
+        boolean showOrientation = !isModifier && (selected || paintSettings.isShowDirectionArrow()) && !paintSettings.isUseRealWidth();
         boolean showOneway = !isModifier && !selected &&
-                !paintSettings.isUseRealWidth() &&
-                paintSettings.isShowDirectionArrow() && w.hasDirectionKeys();
+        !paintSettings.isUseRealWidth() &&
+        paintSettings.isShowOnewayArrow() && w.hasDirectionKeys();
         boolean onewayReversed = w.reversedDirection();
         /* head only takes over control if the option is true,
@@ -215 +215 @@
                 myWidth = line.getLineWidth();
             }
-            myLine = new BasicStroke(myWidth, line.getEndCap(), line.getLineJoin(), 
+            myLine = new BasicStroke(myWidth, line.getEndCap(), line.getLineJoin(),
                     line.getMiterLimit(), line.getDashArray(), line.getDashPhase());
             if (dashesLine != null) {
@@ -259 +259 @@
         final LineElemStyle other = (LineElemStyle) obj;
         return  equal(line, other.line) &&
-                equal(color, other.color) &&
-                equal(dashesLine, other.dashesLine) &&
-                equal(dashesBackground, other.dashesBackground) &&
-                equal(text, other.text) &&
-                realWidth == other.realWidth;
+        equal(color, other.color) &&
+        equal(dashesLine, other.dashesLine) &&
+        equal(dashesBackground, other.dashesBackground) &&
+        equal(text, other.text) &&
+        realWidth == other.realWidth;
     }
 
@@ -281 +281 @@
     public String toString() {
         return "LineElemStyle{" + super.toString() + "width=" + line.getLineWidth() +
-                " realWidth=" + realWidth + " color=" + Utils.toString(color) +
-                " dashed=" + Arrays.toString(line.getDashArray()) +
-                (line.getDashPhase() == 0f ? "" : " dashesOffses=" + line.getDashPhase()) +
-                " dashedColor=" + Utils.toString(dashesBackground) + '}';
+        " realWidth=" + realWidth + " color=" + Utils.toString(color) +
+        " dashed=" + Arrays.toString(line.getDashArray()) +
+        (line.getDashPhase() == 0f ? "" : " dashesOffses=" + line.getDashPhase()) +
+        " dashedColor=" + Utils.toString(dashesBackground) + '}';
     }
 }