Changeset 3437 in josm for trunk/src

Timestamp:

2010-08-14T21:31:31+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5328 - Tried to split way JOSM crashed

File:

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

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

@@ -311 +311 @@
             wayToAdd.setNodes(chunkIt.next());
             commandList.add(new AddCommand(layer,wayToAdd));
-            //Main.debug("wayToAdd: " + wayToAdd);
             newSelection.add(wayToAdd);
 
@@ -328 +327 @@
                 type = "";
             }
-            int i = 0;
-
+
+            int i_c = 0, i_r = 0;
             List<RelationMember> relationMembers = r.getMembers();
             for (RelationMember rm: relationMembers) {
@@ -402 +401 @@
                         Boolean backwards = null;
                         int k = 1;
-                        while (i - k >= 0 || i + k < relationMembers.size()) {
-                            if ((i - k >= 0) && relationMembers.get(i - k).isWay()){
-                                Way w = relationMembers.get(i - k).getWay();
+                        while (i_r - k >= 0 || i_r + k < relationMembers.size()) {
+                            if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()){
+                                Way w = relationMembers.get(i_r - k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = false;
@@ -412 +411 @@
                                 break;
                             }
-                            if ((i + k < relationMembers.size()) && relationMembers.get(i + k).isWay()){
-                                Way w = relationMembers.get(i + k).getWay();
+                            if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()){
+                                Way w = relationMembers.get(i_r + k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = true;
@@ -424 +423 @@
                         }
 
-                        int j = i;
+                        int j = i_c;
                         for (Way wayToAdd : newWays) {
                             RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
                             j++;
                             if ((backwards != null) && backwards) {
-                                c.addMember(i, em);
+                                c.addMember(i_c, em);
                             } else {
                                 c.addMember(j, em);
                             }
                         }
-                        i = j;
+                        i_c = j;
                     }
                 }
-                i++;
+                i_c++; i_r++;
             }