Changeset 367 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2007-10-12T01:28:49+02:00 (17 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.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (7 diffs)

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