Changeset 367 in josm

Timestamp:

2007-10-12T01:28:49+02:00 (18 years ago)

Author:

framm

Message:

• changed appearance of tagged nodes (now: dot with square around it) and untagged ways (now: have their own colour). FOr this I introduced a "tagged" flag that is only set when the primitive has "interesting" tags; currently, "created_by", "source", and "note" are deemed un-interesting.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (7 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (7 diffs)
• io/OsmReader.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -81 +83 @@
 
         /**
+         * true if this object is considered "tagged". To be "tagged", an object
+         * must have one or more "non-standard" tags. "created_by" and "source"
+         * are typically considered "standard" tags and do not make an object 
+         * "tagged".
+         */
+        public boolean tagged = false;
+        
+        /**
          * If set to true, this object is currently selected.
          */
@@ -104 +114 @@
         public boolean incomplete = false; 
 
+        /**
+         * Contains a list of "uninteresting" keys that do not make an object
+         * "tagged".
+         */
+        public static Collection<String> uninteresting = 
+                new HashSet<String>(Arrays.asList(new String[] {"source", "note", "created_by"}));
+        
         /**
          * Implementation of the visitor scheme. Subclases have to call the correct
@@ -176 +193 @@
                         keys.put(key, value);
                 }
+                checkTagged();
         }
         /**
@@ -186 +204 @@
                                 keys = null;
                 }
+                checkTagged();
         }
 
@@ -215 +234 @@
                 selected = osm.selected;
                 timestamp = osm.timestamp;
+                tagged = osm.tagged;
         }
 
@@ -237 +257 @@
         }
         
+        /**
+         * Updates the "tagged" flag. "keys" property should probably be made private
+         * to make sure this gets called when keys are set.
+         */
+        public void checkTagged() {
+                tagged = false;
+                if (keys != null) {
+                        for (Entry<String,String> e : keys.entrySet()) {
+                                if (!uninteresting.contains(e.getKey())) {
+                                        tagged = true;
+                                        break;
+                                }
+                        }
+                }
+        }
         
 }

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

@@ -7 +7 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
@@ -51 +52 @@
         protected Color nodeColor;
         protected Color dfltWayColor;
+        protected Color untaggedWayColor;
         protected Color incompleteColor;
         protected Color backgroundColor;
@@ -68 +70 @@
                 nodeColor = getPreferencesColor("node", Color.RED);
                 dfltWayColor = getPreferencesColor("way", darkblue);
+                untaggedWayColor = getPreferencesColor("untagged way", darkgreen);
                 incompleteColor = getPreferencesColor("incomplete way", darkerblue);
                 backgroundColor = getPreferencesColor("background", Color.BLACK);
@@ -73 +76 @@
                 showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
                 
+                // draw tagged ways first, then untagged ways. takes
+                // time to iterate through list twice, OTOH does not
+                // require changing the colour while painting...
                 for (final OsmPrimitive osm : data.ways)
-                        if (!osm.deleted && !osm.selected)
+                        if (!osm.deleted && !osm.selected && osm.tagged)
                                 osm.visit(this);
                 displaySegments(null);
+
+            for (final OsmPrimitive osm : data.ways)
+                        if (!osm.deleted && !osm.selected && !osm.tagged)
+                                osm.visit(this);
+                displaySegments(null);
+            
                 for (final OsmPrimitive osm : data.nodes)
                         if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
+        
                 for (final OsmPrimitive osm : data.getSelected())
                         if (!osm.deleted)
@@ -113 +126 @@
 
                 Color wayColor;
-                if (inactive)
+                
+                if (inactive) {
                         wayColor = inactiveColor;
-                else {
+                } else if (!w.tagged) {
+                        wayColor = untaggedWayColor;
+                } else {
                         wayColor = dfltWayColor;
                 }
@@ -171 +187 @@
 
                 if (screen.contains(p.x, p.y))
-                        g.drawRect(p.x-1, p.y-1, 2, 2);
+                        if (n.tagged) {
+                                g.drawRect(p.x, p.y, 0, 0);
+                                g.drawRect(p.x-2, p.y-2, 4, 4);
+                        } else {
+                                g.drawRect(p.x-1, p.y-1, 2, 2);
+                        }
         }
 
@@ -179 +200 @@
         protected void drawSegment(Node n1, Node n2, Color col, boolean showDirection) {
 
-                if (col != currentColor) {
-                        displaySegments(col);
-                }
+                if (col != currentColor) displaySegments(col);
                 
                 Point p1 = nc.getPoint(n1.eastNorth);

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

@@ -88 +88 @@
                         osm.user = user;
                         osm.visible = visible;
+                        osm.checkTagged();
                 }
         }