Changeset 19195 in josm for trunk/src/org

Timestamp:

2024-08-14T19:44:54+02:00 (5 months ago)

Author:

taylor.smock

Message:

Fix #23860: Duplicate key+value in preset causes an ISE in TagChecker

This fixes the actual issue in TagChecker, but also adds a sanity check to
TaggingPresetPreferenceTestIT since it is usually unintended to have
duplicate key/values (and it is always a problem if they are different and are
Key items).

The fix for TagChecker is just keeping whatever value is last. Not ideal, but
it should work 99% of the time since an object won't match the preset if we have
highway=footway and highway=footway2 as Key objects.

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (1 diff)

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

@@ -719 +719 @@
             Map<String, String> matchingTags = tp.data.stream()
                     .filter(i -> Boolean.TRUE.equals(i.matches(tags)))
-                    .filter(i -> i instanceof KeyedItem).map(i -> ((KeyedItem) i).key)
-                    .collect(Collectors.toMap(k -> k, tags::get));
+                    .filter(KeyedItem.class::isInstance).map(i -> ((KeyedItem) i).key)
+                    .collect(Collectors.toMap(k -> k, tags::get, (o, n) -> n));
             if (matchingPresetsOK.stream().noneMatch(
                     tp2 -> matchingTags.entrySet().stream().allMatch(