Changeset 17223 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-10-17T14:32:30+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19951: No warning when multipolygon preset is applied to node(s) only

• Show "Multipolygon is not closed" also when relation doesn't contain any way

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -185 +185 @@
         int oldErrorsSize = errors.size();
 
+        Map<Long, RelationMember> wayMap = r.getMembers().stream()
+                .filter(RelationMember::isWay)
+                .collect(Collectors.toMap(mem -> mem.getWay().getUniqueId(), mem -> mem, (a, b) -> b));
         List<Node> openNodes = polygon.getOpenEnds();
-        if (!openNodes.isEmpty()) {
+        if (!openNodes.isEmpty() || wayMap.isEmpty()) {
             errors.add(TestError.builder(this, Severity.ERROR, NON_CLOSED_WAY)
                     .message(tr("Multipolygon is not closed"))
@@ -194 +197 @@
         }
 
-        Map<Long, RelationMember> wayMap = r.getMembers().stream()
-                .filter(RelationMember::isWay)
-                .collect(Collectors.toMap(mem -> mem.getWay().getUniqueId(), mem -> mem, (a, b) -> b));
         // duplicate members were checked before
         if (wayMap.isEmpty())