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

Timestamp:

2010-01-07T22:21:37+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4270 - keep linked-state in relations intact when splitting ways.
The split way chunks will stay linked to the closest way.

File:

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

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

@@ -331 +331 @@
             int i = 0;
 
-            for (RelationMember rm : r.getMembers()) {
+            List<RelationMember> relationMembers = r.getMembers();
+            for (RelationMember rm: relationMembers) {
                 if (rm.isWay() && rm.getMember() == way) {
                     boolean insert = true;
@@ -379 +380 @@
                                     insert = false;
                                 }
-                            }
-                            else
+                            } else {
                                 insert = false;
-                        }
-                        else if(!"via".equals(role))
+                            }
+                        }
+                        else if(!"via".equals(role)) {
                             warnme = true;
+                        }
                     }
                     else if (!("route".equals(type)) && !("multipolygon".equals(type))) {
@@ -395 +397 @@
                     if(insert)
                     {
+                        if (rm.hasRole() && !("multipolygon".equals(type))) {
+                            warnmerole = true;
+                        }
+
+                        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();
+                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
+                                    backwards = false;
+                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
+                                    backwards = true;
+                                }
+                                break;
+                            }
+                            if ((i + k < relationMembers.size()) && relationMembers.get(i + k).isWay()){
+                                Way w = relationMembers.get(i + k).getWay();
+                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
+                                    backwards = true;
+                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
+                                    backwards = false;
+                                }
+                                break;
+                            }
+                        }
+
                         int j = i;
-                        boolean backwards = "backward".equals(rm.getRole());
                         for (Way wayToAdd : newWays) {
                             RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
-                            if (em.hasRole() && !("multipolygon".equals(type))) {
-                                warnmerole = true;
-                            }
-
                             j++;
-                            if (backwards) {
+                            if ((backwards != null) && backwards) {
                                 c.addMember(i, em);
                             } else {