Changeset 2890 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

Timestamp:

24.01.2010 17:55:56 (2 years ago)

Author:

bastiK

Message:

Reverse Arrows for 'oneway=-1' and similar (see #2387).
More efficient calculation of arrow geometry.
Test file for Arrow direction added.

File:

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

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

@@ -146 +146 @@
         boolean showDirection = selected || ((!paintSettings.isUseRealWidth()) && (paintSettings.isShowDirectionArrow()
                 && (!paintSettings.isShowRelevantDirectionsOnly() || w.hasDirectionKeys())));
+        boolean reversedDirection = w.reversedDirection();
         /* head only takes over control if the option is true,
         the direction should be shown at all and not only because it's selected */
@@ -189 +190 @@
                 if(!s.over) {
                     painter.drawWay(w, s.color != null && selected ? myColor: s.color, s.getWidth(myWidth),
-                            s.getDashed(), s.dashedColor, false, false);
+                            s.getDashed(), s.dashedColor, false, false, false);
                 }
             }
@@ -195 +196 @@
 
         /* draw the way */
-        painter.drawWay(w, myColor, myWidth, dashed, dashedColor, showDirection, showOnlyHeadArrowOnly);
+        painter.drawWay(w, myColor, myWidth, dashed, dashedColor, showDirection, selected ? false : reversedDirection, showOnlyHeadArrowOnly);
 
         /* draw overlays above the way */
@@ -202 +203 @@
                 if(s.over) {
                     painter.drawWay(w, s.color != null && selected ? myColor : s.color, s.getWidth(myWidth),
-                            s.getDashed(), s.dashedColor, false, false);
+                            s.getDashed(), s.dashedColor, false, false, false);
                 }
             }