Changeset 13065 in josm for trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

Timestamp:

2017-11-01T13:58:59+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #12347 - Split way breaks destination_sign relations

File:

• trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (1 diff)

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

@@ -443 +443 @@
 
     static OsmPrimitive findVia(Relation r, String type) {
-        for (RelationMember rmv : r.getMembers()) {
-            if (("restriction".equals(type) && "via".equals(rmv.getRole()))
-             || ("destination_sign".equals(type) && rmv.hasRole("sign", "intersection"))) {
-                return rmv.getMember();
-            }
-        }
-        return null;
+        switch (type) {
+        case "restriction":
+            return findRelationMember(r, "via").orElse(null);
+        case "destination_sign":
+            // Prefer intersection over sign, see #12347
+            return findRelationMember(r, "intersection").orElse(findRelationMember(r, "sign").orElse(null));
+        default:
+            return null;
+        }
+    }
+
+    static Optional<OsmPrimitive> findRelationMember(Relation r, String role) {
+        return r.getMembers().stream().filter(rmv -> role.equals(rmv.getRole()))
+                .map(RelationMember::getMember).findAny();
     }