Changeset 16048 in josm for trunk

Timestamp:

2020-03-06T10:37:17+01:00 (4 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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (1 diff)
• test/data/regress/18744 (added)
• test/data/regress/18744/18744-sample.osm (added)
• test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.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(

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -146 +146 @@
 
     /**
+     * Non-regression test for bug #18744.
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if OSM parsing fails
+     */
+    @Test
+    public void testTicket18744() throws IOException, IllegalDataException {
+        try (InputStream is = TestUtils.getRegressionDataStream(18744, "18744-sample.osm")) {
+            DataSet ds = OsmReader.parseDataSet(is, null);
+            Layer layer = new OsmDataLayer(ds, null, null);
+            MainApplication.getLayerManager().addLayer(layer);
+            try {
+                assertEquals(3, ds.getWays().size());
+                new JoinAreasAction(false).join(ds.getWays());
+                // join should not have changed anything
+                assertEquals(3, ds.getWays().size());
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                MainApplication.getLayerManager().removeLayer(layer);
+            }
+        }
+    }
+
+
+    /**
      * Non-regression test which checks example files in nodist/data
      * @throws Exception if an error occurs