Changeset 15681 in josm for trunk/src/org

Timestamp:

2020-01-11T16:48:54+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18083 (again): Don't combine ways when the shared node is old and outside of the download area. If that happens, show a notification "Combine ways refused. (A shared node is outside of the download area)"
Please suggest a better message text.

File:

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

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -281 +283 @@
             return;
         }
+
+        // see #18083: check if we will combine ways at nodes outside of the download area
+        Set<Node> endNodesOutside = new HashSet<>();
+        for (Way w : selectedWays) {
+            final Node[] endnodes = { w.firstNode(), w.lastNode() };
+            for (Node n : endnodes) {
+                if (!n.isNew() && n.isOutsideDownloadArea() && !endNodesOutside.add(n)) {
+                    new Notification(tr("Combine ways refused<br>" + "(A shared node is outside of the download area)"))
+                            .setIcon(JOptionPane.INFORMATION_MESSAGE).show();
+                    return;
+
+                }
+            }
+        }
+
         // combine and update gui
         Pair<Way, Command> combineResult;