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

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

Files:

• data/osm/visitor/paint/MapPaintSettings.java (modified) (4 diffs)
• data/osm/visitor/paint/SimplePaintVisitor.java (modified) (3 diffs)
• gui/mappaint/LineElemStyle.java (modified) (5 diffs)
• gui/preferences/DrawingPreference.java (modified) (6 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 */

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) + '}';
     }
 }

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

@@ -52 +52 @@
     private JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)"));
     private JTextField drawGpsArrowsMinDist = new JTextField(8);
-    private JCheckBox interestingDirections = new JCheckBox(tr("Only interesting direction hints (e.g. with oneway tag)."));
     private JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
+    private JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
     private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
     private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
@@ -62 +62 @@
     private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
     private JComboBox waypointLabel = new JComboBox(new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"),
-                                      /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Both"), tr("None")});
+            /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Both"), tr("None")});
 
     public void addGui(PreferenceTabbedPane gui) {
@@ -227 +227 @@
             public void actionPerformed(ActionEvent e) {
                 if (directionHint.isSelected()){
-                    interestingDirections.setSelected(Main.pref.getBoolean("draw.segment.relevant_directions_only", true));
                     headArrow.setSelected(Main.pref.getBoolean("draw.segment.head_only", false));
                 }else{
-                    interestingDirections.setSelected(false);
                     headArrow.setSelected(false);
                 }
-                interestingDirections.setEnabled(directionHint.isSelected());
                 headArrow.setEnabled(directionHint.isSelected());
             }
@@ -240 +237 @@
         directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction", true));
         panel.add(directionHint, GBC.eop().insets(20,0,0,0));
-
-        // only interesting directions
-        interestingDirections.setToolTipText(tr("Only interesting direction hints (e.g. with oneway tag)."));
-        interestingDirections.setSelected(Main.pref.getBoolean("draw.segment.relevant_directions_only", true));
-        interestingDirections.setEnabled(directionHint.isSelected());
-        panel.add(interestingDirections, GBC.eop().insets(40,0,0,0));
 
         // only on the head of a way
@@ -252 +243 @@
         headArrow.setEnabled(directionHint.isSelected());
         panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
+
+        // draw oneway arrows
+        onewayArrow.setToolTipText(tr("Draw arrows in the direction of oneways and other directed features."));
+        onewayArrow.setSelected(Main.pref.getBoolean("draw.oneway", true));
+        panel.add(onewayArrow, GBC.eop().insets(20,0,0,0));
 
         // segment order number
@@ -312 +308 @@
         Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected());
         Main.pref.put("draw.segment.direction", directionHint.isSelected());
-        Main.pref.put("draw.segment.relevant_directions_only", interestingDirections.isSelected());
         Main.pref.put("draw.segment.head_only", headArrow.isSelected());
+        Main.pref.put("draw.oneway", onewayArrow.isSelected());
         Main.pref.put("draw.segment.order_number", segmentOrderNumber.isSelected());
         Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());