Changeset 7742 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-11-23T22:25:29+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10778 - fix automatic member role assignment when relation matches several presets

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/AddSelectionToRelations.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
+/**
+ * Add all objects selected in the current dataset after the last member of relation(s).
+ * @since 5799
+ */
 public class AddSelectionToRelations extends AbstractRelationAction implements SelectionChangedListener {
     /**

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

@@ -737 +737 @@
     }
 
+    /**
+     * Adds primitives to a given relation.
+     * @param orig The relation to modify
+     * @param primitivesToAdd The primitives to add as relation members
+     * @return The resulting command
+     * @throws IllegalArgumentException if orig is null
+     */
     public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd)
             throws IllegalArgumentException {
@@ -753 +760 @@
                     continue;
                 }
-                final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(p);
-                relation.addMember(new RelationMember(role == null ? "" : role, p));
+                final Set<String> roles = findSuggestedRoles(presets, p);
+                relation.addMember(new RelationMember(roles.size() == 1 ? roles.iterator().next() : "", p));
                 modified = true;
             }
@@ -761 +768 @@
             return null;
         }
+    }
+
+    protected static Set<String> findSuggestedRoles(final Collection<TaggingPreset> presets, OsmPrimitive p) {
+        final Set<String> roles = new HashSet<>();
+        for (TaggingPreset preset : presets) {
+            String role = preset.suggestRoleForOsmPrimitive(p);
+            if (role != null && !role.isEmpty()) {
+                roles.add(role);
+            }
+        }
+        return roles;
     }