Changeset 926 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2008-09-04T13:37:45+02:00 (16 years ago)

Author:

stoecker

Message:

fixed relation handling for multiple times splitted ways

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (4 diffs)

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

@@ -240 +240 @@
                 newSelection.add(selectedWay);
 
+                Collection<Way> newWays = new ArrayList<Way>();
                 // Second, create new ways
                 while (chunkIt.hasNext()) {
@@ -248 +249 @@
                                 wayToAdd.checkDirectionTagged();
                         }
+                        newWays.add(wayToAdd);
                         wayToAdd.nodes.addAll(chunkIt.next());
                         commandList.add(new AddCommand(wayToAdd));
@@ -253 +255 @@
                         newSelection.add(wayToAdd);
 
-                        Boolean warnme=false;
-                        // now copy all relations to new way also
-                        for (Relation r : Main.ds.relations) {
-                                if (r.deleted || r.incomplete) continue;
-                                for (RelationMember rm : r.members) {
-                                        if (rm.member instanceof Way) {
-                                                if (rm.member == selectedWay)
+                }
+                Boolean warnme=false;
+                // now copy all relations to new way also
+                for (Relation r : Main.ds.relations) {
+                        if (r.deleted || r.incomplete) continue;
+                        for (RelationMember rm : r.members) {
+                                if (rm.member instanceof Way) {
+                                        if (rm.member == selectedWay)
+                                        {
+                                                Relation c = new Relation(r);
+                                                for(Way wayToAdd : newWays)
                                                 {
-                                                        Relation c = new Relation(r);
                                                         RelationMember em = new RelationMember();
                                                         em.member = wayToAdd;
@@ -268 +273 @@
                                                                 warnme = true;
                                                         c.members.add(em);
-                                                        commandList.add(new ChangeCommand(r, c));
-                                                        break;
                                                 }
+                                                commandList.add(new ChangeCommand(r, c));
+                                                break;
                                         }
                                 }
                         }
-                        if(warnme)
-                                JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to both new ways.\nYou should verify this and correct it when necessary."));
-                }
+                }
+                if(warnme)
+                        JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to all new ways.\nYou should verify this and correct it when necessary."));
 
                 NameVisitor v = new NameVisitor();