Ticket #7201: 7201.patch

src/org/openstreetmap/josm/data/osm/Tag.java

@@ -78 +78 @@
         return this.key.equals(key);
     }
 
-    /**
-     * Normalizes the key and the value of the tag by
-     * <ul>
-     *   <li>removing leading and trailing white space</li>
-     * <ul>
-     *
-     */
-    public void normalize() {
-        key = key.trim();
-        value = value.trim();
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * TagCollection is a collection of tags which can be used to manipulate
@@ -711 +713 @@
 
         // See #7201 combining ways screws up the order of ref tags
         Set<String> originalValues = getValues(key);
-        if (originalValues.size() == 1)
+        if (originalValues.size() == 1) {
             return originalValues.iterator().next();
+        }
 
-        StringBuilder buffer = new StringBuilder();
-        Set<String> valSet = new HashSet<String>();
-        for (String vs : originalValues) {
-            valSet.addAll(Arrays.asList(vs.split(";")));
+        Set<String> values = new LinkedHashSet<String>();
+        Map<String, Collection<String>> originalSplitValues = new LinkedHashMap<String, Collection<String>>();
+        for (String v : originalValues) {
+            List<String> vs = Arrays.asList(v.split(";\\s*"));
+            originalSplitValues.put(v, vs);
+            values.addAll(vs);
         }
-        List<String> values = new ArrayList<String>(valSet);
         values.remove("");
-        Collections.sort(values);
-        Iterator<String> iter = values.iterator();
-        while (iter.hasNext()) {
-            buffer.append(iter.next());
-            if (iter.hasNext()) {
-                buffer.append(";");
+        // try to retain an already existing key if it contains all needed values (remove this if it causes performance problems)
+        for (Entry<String, Collection<String>> i : originalSplitValues.entrySet()) {
+            if (i.getValue().containsAll(values)) {
+                return i.getKey();
             }
         }
-        return buffer.toString();
+        return Utils.join(";", values);
     }
 
     @Override