Changeset 16048 in josm for trunk/src

Timestamp:

2020-03-06T10:37:17+01:00 (5 years ago)

Author:

GerdP

Message:

fix #18744: "Join Overlapping Areas" shows confusing dialogs when merging inner and outer ways of a multipolygon
Refuse to join ways when one is an outer way and at least one is an inner way of the same multipolygon relation

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (1 diff)

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

@@ -1534 +1534 @@
             innerWays.retainAll(selectedWays);
 
+            if (!innerWays.isEmpty() && selectedWays.contains(outerWay)) {
+                // see #18744
+                new Notification(tr("Cannot join inner and outer ways of a multipolygon"))
+                        .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                        .show();
+                return null;
+            }
+
             if (processedOuterWays.contains(outerWay)) {
                 new Notification(