Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

• trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -571 +572 @@
             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values"));
         for (Tag tag: tags) {
-            primitive.put(tag.getKey(), tag.getValue());
+            if (tag.getValue() == null || tag.getValue().equals("")) {
+                primitive.remove(tag.getKey());
+            } else {
+                primitive.put(tag.getKey(), tag.getValue());
+            }
         }
     }
@@ -682 +687 @@
         return ret;
     }
+
+    /**
+     * Replies the concatenation of all tag values (concatenated by a semicolon)
+     * 
+     * @return the concatenation of all tag values
+     */
+    public String getJoinedValues(String key) {
+        StringBuffer buffer = new StringBuffer();
+        List<String> values = new ArrayList<String>(getValues(key));
+        values.remove("");
+        Collections.sort(values);
+        Iterator<String> iter = values.iterator();
+        while (iter.hasNext()) {
+            buffer.append(iter.next());
+            if (iter.hasNext()) {
+                buffer.append(";");
+            }
+        }
+        return buffer.toString();
+    }
 }