Changeset 4291 in josm

Timestamp:

2011-08-08T00:02:32+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6254- patch by simon04 - Combine ways should merge multivalue tags more intelligently

File:

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

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

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -708 +709 @@
      */
     public String getJoinedValues(String key) {
-        StringBuffer buffer = new StringBuffer();
-        List<String> values = new ArrayList<String>(getValues(key));
+        StringBuilder buffer = new StringBuilder();
+        HashSet<String> valSet = new HashSet<String>();
+        for (String vs : getValues(key)) {
+            valSet.addAll(Arrays.asList(vs.split(";")));
+        }
+        List<String> values = new ArrayList<String>(valSet);
         values.remove("");
         Collections.sort(values);