Changeset 19195 in josm for trunk/resources

Timestamp:

2024-08-14T19:44:54+02:00 (4 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/resources/data/defaultpresets.xml (modified) (3 diffs)

trunk/resources/data/defaultpresets.xml

@@ -3273 +3273 @@
                 <check key="ferry:cable" text="Reaction ferry" />
                 <space />
-                <reference ref="oh" />
                 <reference ref="public_transport_route_optionals" />
                 <reference ref="pt_route_opt2" />
@@ -3809 +3808 @@
             </checkgroup>
             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
-            <reference ref="wheelchair" />
             <reference ref="internet" />
             <space />
@@ -6983 +6981 @@
                 <combo key="generator:type" text="Generator Type" values_searchable="true">
                     <list_entry value="bioreactor" short_description="gasification" />
+                    <list_entry value="boiler" short_description="" />
                     <list_entry value="pyrolysis" short_description="" />
                     <list_entry value="reciprocating_engine" short_description="combustion" />
                     <list_entry value="steam_generator" short_description="combustion" />
                 </combo>
-                <combo key="generator:type" text="Generator Type" values="bioreactor,boiler,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
             </item> <!-- Waste Power Generator -->