Changeset 6478 in josm for trunk

Timestamp:

2013-12-16T01:51:52+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9420 - Robustness on suggested roles in relation editor for relations matching several presets (rare regression from r6464)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -11 +11 @@
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -402 +403 @@
         int idx = index;
         for (OsmPrimitive primitive : primitives) {
-            final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(primitive);
+            Set<String> potentialRoles = new TreeSet<String>();
+            for (TaggingPreset tp : presets) {
+                String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive);
+                if (suggestedRole != null) {
+                    potentialRoles.add(suggestedRole);
+                }
+            }
+            // TODO: propose user to choose role among potential ones instead of picking first one
+            final String role = potentialRoles.isEmpty() ? null : potentialRoles.iterator().next();
             RelationMember member = new RelationMember(role == null ? "" : role, primitive);
             members.add(idx++, member);