Changeset 597 in josm

Timestamp:

2008-04-07T22:04:53+02:00 (17 years ago)

Author:

ramack

Message:

• implement ticket #671: add option to draw only interesting direction arrows, where interesting means: they way is tagged with a key oneway, incline, incline_steep or aerialway

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (5 diffs)
• data/osm/Way.java (modified) (2 diffs)
• data/osm/visitor/MapPaintVisitor.java (modified) (3 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (4 diffs)
• gui/preferences/DrawingPreference.java (modified) (3 diffs)
• io/OsmReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -241 +241 @@
                                 wayToAdd.keys = new HashMap<String, String>(selectedWay.keys);
                                 wayToAdd.checkTagged();
+                                wayToAdd.checkDirectionTagged();
                         }
                         wayToAdd.nodes.addAll(chunkIt.next());

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -264 +264 @@
                                 wnew2.keys = new HashMap<String, String>(wnew.keys);
                                 wnew2.checkTagged();
+                                wnew2.checkDirectionTagged();
                         }
                         wnew2.nodes.addAll(n2);

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -83 +83 @@
         
         /**
+         * true if this object has direction dependant tags (e.g. oneway)
+         */
+        public boolean hasDirectionKeys = false;
+        
+        /**
          * If set to true, this object is currently selected.
          */
@@ -112 +117 @@
         public static Collection<String> uninteresting = 
                 new HashSet<String>(Arrays.asList(new String[] {"source", "note", "created_by"}));
+        
+        /**
+         * Contains a list of direction-dependent keys that do not make an object
+         * direction dependent.
+         */
+        public static Collection<String> directionKeys = 
+                new HashSet<String>(Arrays.asList(new String[] {"oneway", "incline", "incline_steep", "aerialway"}));
         
         /**
@@ -186 +198 @@
                 }
                 checkTagged();
+                checkDirectionTagged();
         }
         /**
@@ -197 +210 @@
                 }
                 checkTagged();
+                checkDirectionTagged();
         }
 
@@ -266 +280 @@
                 }
         }
+    /**
+     * Updates the "hasDirectionKeys" flag. "keys" property should probably be made private
+     * to make sure this gets called when keys are set.
+     */
+    public void checkDirectionTagged() {
+        hasDirectionKeys = false;
+        if (keys != null) {
+            for (Entry<String,String> e : keys.entrySet()) {
+                if (directionKeys.contains(e.getKey())) {
+                    hasDirectionKeys = true;
+                    break;
+                }
+            }
+        }
+
+    }
         
 }

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -53 +53 @@
          */
         public Way(Way clone) {
-                cloneFrom(clone);
+            cloneFrom(clone);            
         }
         
@@ -75 +75 @@
                 nodes.clear();
                 nodes.addAll(((Way)osm).nodes);
+                checkDirectionTagged();
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -75 +75 @@
         protected Color backgroundColor;
         protected boolean showDirectionArrow;
+    protected boolean showRelevantDirectionsOnly;
         protected boolean showOrderNumber;
         
@@ -136 +137 @@
         public void visit(Way w) {
                 double circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
-                boolean showDirection = showDirectionArrow && w.selected;
-                if (useRealWidth && showDirection) showDirection = false;
+                // show direction arrows, if draw.segment.relevant_directions_only is not set, the way is tagged with a direction key
+                // (even if the tag is negated as in oneway=false) or the way is selected
+                boolean showDirection = (!useRealWidth)
+                                        && (w.selected || (showDirectionArrow
+                                                           && (!showRelevantDirectionsOnly || w.hasDirectionKeys)));
+
                 Color colour = untaggedColor;
                 int width = 2;
                 int realWidth = 0; //the real width of the element in meters 
                 boolean dashed = false;
-                boolean area=false;
+                boolean area = false;
                 ElemStyle wayStyle = MapPaintStyles.getStyle(w);
 
@@ -352 +357 @@
                 textColor = getPreferencesColor ("text", Color.WHITE);
                 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
+                showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");
                 showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
                 useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth",false);

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

@@ -54 +54 @@
         protected Color incompleteColor;
         protected Color backgroundColor;
-        protected boolean showDirectionArrow;
+    protected boolean showDirectionArrow;
+    protected boolean showRelevantDirectionsOnly;
         protected boolean showOrderNumber;
         
@@ -75 +76 @@
                 backgroundColor = getPreferencesColor("background", Color.BLACK);
                 showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
+                showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only");
                 showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
                 
@@ -126 +128 @@
                 if (w.incomplete) return;
 
+                // show direction arrows, if draw.segment.relevant_directions_only is not set, the way is tagged with a direction key
+                // (even if the tag is negated as in oneway=false) or the way is selected
+
+                boolean showThisDirectionArrow = w.selected
+                                                 || (showDirectionArrow
+                                                     && (!showRelevantDirectionsOnly || w.hasDirectionKeys));
                 Color wayColor;
                 
@@ -141 +149 @@
                         for (int orderNumber = 1; it.hasNext(); orderNumber++) {
                                 Point p = nc.getPoint(it.next().eastNorth);
-                                drawSegment(lastP, p, w.selected && !inactive ? selectedColor : wayColor, showDirectionArrow || w.selected);
+                                drawSegment(lastP, p, w.selected && !inactive ? selectedColor : wayColor, showThisDirectionArrow);
                                 if (showOrderNumber)
                                         drawOrderNumber(lastP, p, orderNumber);

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

@@ -18 +18 @@
         private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points."));
         private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
+        private JCheckBox interestingDirections = new JCheckBox(tr("Only interesting direction hints (e.g. with oneway tag)."));
         private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
         private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
@@ -47 +48 @@
                 
                 // directionHint
-                directionHint.setToolTipText(tr("Draw direction hints for all segments."));
+                directionHint.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                            if (directionHint.isSelected()){
+                                interestingDirections.setSelected(Main.pref.getBoolean("draw.segment.relevant_directions_only"));
+                            }else{
+                                interestingDirections.setSelected(false);
+                            }
+                            interestingDirections.setEnabled(directionHint.isSelected());
+                        }
+                });
+                directionHint.setToolTipText(tr("Draw direction hints for segments."));
                 directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction"));
                 gui.display.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"));
+                interestingDirections.setEnabled(directionHint.isSelected());
+                gui.display.add(interestingDirections, GBC.eop().insets(40,0,0,0));
                 
                 // segment order number
@@ -72 +89 @@
                 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.order_number", segmentOrderNumber.isSelected());
                 Main.pref.put("draw.data.downloaded_area", sourceBounds.isSelected());

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -86 +86 @@
                         osm.visible = visible;
                         osm.checkTagged();
+                        osm.checkDirectionTagged();
                 }
         }