Changeset 4746 in josm for trunk/src

Timestamp:

2011-12-29T18:53:59+01:00 (13 years ago)

Author:

jttt

Message:

Fix #7201 combining ways screws up the order of ref tags

File:

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

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

@@ -13 +13 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Map.Entry;
 
 /**
@@ -709 +709 @@
      */
     public String getJoinedValues(String key) {
+
+        // See #7201 combining ways screws up the order of ref tags
+        Set<String> originalValues = getValues();
+        if (originalValues.size() == 1)
+            return originalValues.iterator().next();
+
         StringBuilder buffer = new StringBuilder();
-        HashSet<String> valSet = new HashSet<String>();
-        for (String vs : getValues(key)) {
+        Set<String> valSet = new HashSet<String>();
+        for (String vs : originalValues) {
             valSet.addAll(Arrays.asList(vs.split(";")));
         }