Changeset 17375 in josm for trunk/src

Timestamp:

2020-11-29T10:57:33+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20163: Split way corrupts relation when splitting via way

• if via way in turn restriction is split we have to insert new member

File:

• trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -467 +467 @@
                         if (rValue.warnme) warnings.add(WarningType.GENERIC);
                         insert = rValue.insert;
-                        c = rValue.relation;
+                        c = rValue.relation; // Value.relation is null or contains a modified copy
                     } else if (!isOrderedRelation) {
                         // Warn the user when relations that are not a route or multipolygon are modified as a result
@@ -473 +473 @@
                         warnings.add(WarningType.GENERIC);
                     }
-                    if (c == null) {
-                        c = new Relation(r);
-                    }
 
                     if (insert) {
+                        if (c == null) {
+                            c = new Relation(r);
+                        }
                         if (rm.hasRole() && !nowarnroles.contains(rm.getRole())) {
                             warnings.add(WarningType.ROLE);
@@ -818 +818 @@
                     c.addMember(new RelationMember(role, res));
                     c.removeMembersFor(way);
-                    relationInformation.insert = false;
                 }
-            } else {
-                relationInformation.insert = false;
             }
         } else if (!"via".equals(role)) {
             relationInformation.warnme = true;
+        } else {
+            relationInformation.insert = true;
         }
         relationInformation.relation = c;