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

Timestamp:

2015-10-29T12:52:09+01:00 (8 years ago)

Author:

simon04

Message:

see #10730 - Way splitting: fix and test (route) relation adaption

File:

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

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

@@ -567 +567 @@
             newSelection.add(way);
         }
+        final int indexOfWayToKeep = newWays.indexOf(wayToKeep);
         newWays.remove(wayToKeep);
 
@@ -677 +678 @@
 
                         int j = i_c;
-                        for (Way wayToAdd : newWays) {
+                        final List<Way> waysToAddBefore = newWays.subList(0, indexOfWayToKeep);
+                        for (Way wayToAdd : waysToAddBefore) {
                             RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
                             j++;
-                            if ((backwards != null) && backwards) {
+                            if (Boolean.TRUE.equals(backwards)) {
+                                c.addMember(i_c + 1, em);
+                            } else {
+                                c.addMember(j - 1, em);
+                            }
+                        }
+                        final List<Way> waysToAddAfter = newWays.subList(indexOfWayToKeep, newWays.size());
+                        for (Way wayToAdd : waysToAddAfter) {
+                            RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
+                            j++;
+                            if (Boolean.TRUE.equals(backwards)) {
                                 c.addMember(i_c, em);
                             } else {