SVG icons in archives with same filename are duplicated

[JeroenHoek]

With two Map Paint Styles in use that both have an icon called 'icon.svg' attached to their respective Trac-pages, JOSM shows them correctly in the Map paint preferences dialog where they can be downloaded, but uses the same icon from one of them for both in the menu and preferences window.

It looks like the icons get conflated if the name is the same. The icon name should probably be prefixed with the Map Paint Style name.

Reproduction

• Go to the Map paint preferences, and refresh the list of styles
• See that Parking lanes and Sidewalks and footways (with knobs on) both have distinct icons
• Enable them both
• See that the same icon is reused for both

Correct

Incorrect

Versions tested

Seen in version 17428 and 17475.

[JeroenHoek]

Map paint preferences. This is as it should be.

[JeroenHoek]

Map Paint Styles menu. Icon of Parking lanes is reused for Sidewalks and footways.

[JeroenHoek]

• Parking lanes
• Sidewalks and footways (with knobs on)

[JeroenHoek]

I can reproduce this with two local dummy Map Paint Styles as well. I have attached them in their zipped forms.

When I add both test A and B in their unzipped forms (selecting their mapcss files), the one added later gets the icon of the one loaded first.

When I add both as zip-files, they both get the icon from the Parking lanes style already present.

I am going to give the affected Map Paint Styles differently named icons to prevent JOSM users from seeing this bug: the attached files should reproduce it.

[JeroenHoek]

Test A

[JeroenHoek]

Test B

[JeroenHoek]

Manifestation of bug.

[Don-vip]

In 18178/josm:

fix #20419 - disable svgSalamander filename-based cache when loading SVG files from archives (we have our own cache)