Changeset 19066 in josm

Timestamp:

2024-04-28T11:24:57+02:00 (7 months ago)

Author:

GerdP

Message:

fix #23641: When mapping a forest inside a forest and make that inner, the inner landuse=forest tag is removed.

• change code so the tags of inner ways which are common to the multipolygon are not removed.
• add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (1 diff)
• test/data/regress/23641 (added)
• test/data/regress/23641/data.osm (added)
• test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java (modified) (1 diff)

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

@@ -465 +465 @@
             String key = entry.getKey();
             String value = entry.getValue();
-            List<OsmPrimitive> affectedWays = innerWays.stream().filter(way -> value.equals(way.get(key))).collect(Collectors.toList());
+            List<OsmPrimitive> affectedWays;
+            if ("area".equals(key)) {
+                affectedWays = innerWays.stream().filter(way -> value.equals(way.get(key))).collect(Collectors.toList());
+            } else {
+                affectedWays = new ArrayList<>();
+            }
 
             if (moveTags) {

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

@@ -291 +291 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/23641">Bug #23641</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    void testTicket23642() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(TestUtils.getRegressionDataStream(23641, "data.osm"), null);
+        assertEquals(0, ds.getRelations().size());
+        Pair<SequenceCommand, Relation> cmd = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null);
+        assertNotNull(cmd);
+        cmd.a.executeCommand();
+        assertEquals(1, ds.getRelations().size());
+        Relation mp = ds.getRelations().iterator().next();
+        assertTrue(mp.hasTag("landuse", "forest"));
+        assertTrue(mp.hasTag("leaf_type", "needleleaved"));
+        assertEquals(0, ds.getWays().stream().filter(w -> w.hasTag("leaf_type", "needleleaved")).count());
+        assertEquals(1, ds.getWays().stream().filter(w -> w.hasTag("leaf_type", "broadleaved")).count());
+        assertEquals(1, mp.getMembers().stream()
+                .filter(m -> "inner".equals(m.getRole()) && m.getMember().hasTag("landuse", "forest")).count());
+        Pair<SequenceCommand, Relation> updateCmd = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), mp);
+        assertNull(updateCmd);
+    }
+
 }