Changeset 406 in josm for trunk

Timestamp:

2007-10-19T12:38:34+02:00 (17 years ago)

Author:

framm

Message:

• modify CombineWayAction not to allow merging of ways if they have different relation memberships (either different relations, or different roles in the same relation). Fixes bug #359

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.Node;
@@ -62 +64 @@
                         JOptionPane.showMessageDialog(Main.parent, tr("Please select at least two ways to combine."));
                         return;
+                }
+                
+                // Check whether all ways have identical relationship membership. More 
+                // specifically: If one of the selected ways is a member of relation X
+                // in role Y, then all selected ways must be members of X in role Y.
+                
+                // FIXME: In a later revision, we should display some sort of conflict 
+                // dialog like we do for tags, to let the user choose which relations
+                // should be kept.
+                
+                // Step 1, iterate over all relations and create counters indicating
+                // how many of the selected ways are part of relation X in role Y
+                // (hashMap backlinks contains keys formed like X@Y)
+                HashMap<String, Integer> backlinks = new HashMap<String, Integer>();
+                HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
+                for (Relation r : Main.ds.relations) {
+                        if (r.deleted) continue;
+                        for (RelationMember rm : r.members) {
+                                if (rm.member instanceof Way) {
+                                        for(Way w : selectedWays) {
+                                                if (rm.member == w) {
+                                                        String hash = Long.toString(r.id) + "@" + rm.role;
+                                                        System.out.println(hash);
+                                                        if (backlinks.containsKey(hash)) {
+                                                                backlinks.put(hash, new Integer(backlinks.get(hash)+1));
+                                                        } else {
+                                                                backlinks.put(hash, 1);
+                                                        }
+                                                        // this is just a cache for later use
+                                                        relationsUsingWays.add(r);
+                                                }
+                                        }
+                                }
+                        }
+                }
+                
+                // Step 2, all values of the backlinks HashMap must now equal the size
+                // of the selection.
+                for (Integer i : backlinks.values()) {
+                        if (i.intValue() != selectedWays.size()) {
+                                JOptionPane.showMessageDialog(Main.parent, tr("The selected ways cannot be combined as they have differing relation memberships."));
+                                return;                         
+                        }
                 }
 
@@ -113 +158 @@
                                 newWay.put(e.getKey(), e.getValue().iterator().next());
                 }
+                
                 if (!components.isEmpty()) {
                         int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter values for all conflicts."), JOptionPane.OK_CANCEL_OPTION);
@@ -124 +170 @@
                 cmds.add(new DeleteCommand(selectedWays.subList(1, selectedWays.size())));
                 cmds.add(new ChangeCommand(selectedWays.peek(), newWay));
+                
+                // modify all relations containing the now-deleted ways
+                for (Relation r : relationsUsingWays) {
+                        Relation newRel = new Relation(r);
+                        newRel.members.clear();
+                        for (RelationMember rm : r.members) {
+                                // only copy member if it is either the first of all the selected
+                                // ways (indexOf==0) or not one if the selected ways (indexOf==-1)
+                                if (selectedWays.indexOf(rm.member) < 1) {
+                                        newRel.members.add(new RelationMember(rm));
+                                }
+                        }
+                        cmds.add(new ChangeCommand(r, newRel));
+                }
                 Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds));
                 Main.ds.setSelected(selectedWays.peek());
@@ -195 +255 @@
                         return tr("Could not combine ways "
                                 + "(They could not be merged into a single string of nodes)");
-                } else {
-                        return nodeList;
-                }
+                } 
+                
+                return nodeList;
         }