display external resources icons in the preferences

[Klumbumbus]

It would be nice if the lists of "external" resources in the preferences also display the icons. This applies to

• Styles (Help/Preferences/Map)
• Presets (Help/Preferences/Map#TaggingPresets)
• Rules (Help/Preferences/Validator)
• Imageries (Help/Preferences/Imagery)

[Klumbumbus]

Ticket #14023 has been marked as a duplicate of this ticket.

[Don-vip]

In 15211/josm:

fix #13458 - display external resources icons in the preferences

[Klumbumbus]

Great thanks!
I noticed two things: the icons are stretched, see e.g. the Bus lane preset and the internal icon is totally messed up.

[Don-vip]

In 15213/josm:

see #13458 - keep icon correct shape

[Don-vip]

In 15214/josm:

see #13458 - revert accidental changes

[Don-vip]

Please check, it should be ok now

[Klumbumbus]

The aspect ratio is correct now, but the internal icon still messed up.

[Don-vip]

Work for me:

Can you please try with josm-latest.jar?

[Don-vip]

In 15215/josm:

see #13458 - don't serialize null values

[Klumbumbus]

Replying to Don-vip:

Can you please try with josm-latest.jar?

Same problem there.

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-07-06 22:47:06 +0200 (Sat, 06 Jul 2019)
Build-Date:2019-07-06 21:01:04
Revision:15214
Relative:URL: ^/trunk

Identification: JOSM/1.5 (15214 en) Windows 10 64-Bit
OS Build number: Windows 10 Pro 1803 (17134)
Memory Usage: 927 MB / 1804 MB (263 MB allocated, but free)
Java version: 1.8.0_211-b12, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: \Display0 1680x1050
Maximum Screen Size: 1680x1050

[Don-vip]

It's weird, I don't know what's going on on your machine. Do you have another one to test?

[Don-vip]

In 15220/josm:

see #13458 - move unused icon

[Klumbumbus]

Here on another pc it works fine:

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-07-07 14:17:28 +0200 (Sun, 07 Jul 2019)
Build-Date:2019-07-07 12:18:47
Revision:15221
Relative:URL: ^/trunk

Identification: JOSM/1.5 (15221 de) Windows 10 64-Bit
OS Build number: Windows 10 Pro 1803 (17134)
Memory Usage: 422 MB / 892 MB (255 MB allocated, but free)
Java version: 1.8.0_211-b12, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: \Display0 1366x768
Maximum Screen Size: 1366x768
Dataset consistency test: No problems found

I'll try another one tonight.

[Klumbumbus]

Same glitch here on 3rd (but similar to 1st) pc (this time with java 11 though)

Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-07-07 18:36:38 +0200 (Sun, 07 Jul 2019)
Revision:15226
Build-Date:2019-07-07 16:37:55
URL:https://josm.openstreetmap.de/svn/trunk

Identification: JOSM/1.5 (15226 en) Windows 10 64-Bit
OS Build number: Windows 10 Pro 1803 (17134)
Memory Usage: 620 MB / 2026 MB (187 MB allocated, but free)
Java version: 11.0.2+9-LTS, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: \Display0 2160x1440
Maximum Screen Size: 2160x1440

[Klumbumbus]

Not sure if it is good or bad, but this fixes it for me:

MapPaintPrefHelper.java

@@ -83 +83 @@
         ExtendedSourceEntry defJosmMapcss = new ExtendedSourceEntry(type, "elemstyles.mapcss", "resource://styles/standard/elemstyles.mapcss");
         defJosmMapcss.active = true;
         defJosmMapcss.name = "standard";
-        defJosmMapcss.icon = new ImageProvider("logo").getResource();
+        defJosmMapcss.icon = new ImageProvider("logo.svg").getResource();
         defJosmMapcss.title = tr("JOSM default (MapCSS)");
         defJosmMapcss.description = tr("Internal style to be used as base for runtime switchable overlay styles");
         ExtendedSourceEntry defPL2 = new ExtendedSourceEntry(type, "potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");

PresetPrefHelper.java

@@ -30 +30 @@
     public Collection<ExtendedSourceEntry> getDefault() {
         ExtendedSourceEntry i = new ExtendedSourceEntry(type, "defaultpresets.xml", "resource://data/defaultpresets.xml");
         i.title = tr("Internal Preset");
-        i.icon = new ImageProvider("logo").getResource();
+        i.icon = new ImageProvider("logo.svg").getResource();
         i.description = tr("The default preset for JOSM");
         return Collections.singletonList(i);
     }

ValidatorPrefHelper.java

@@ -85 +85 @@
     private void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
         ExtendedSourceEntry i = new ExtendedSourceEntry(type, filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
         i.title = title;
-        i.icon = new ImageProvider("logo").getResource();
+        i.icon = new ImageProvider("logo.svg").getResource();
         i.description = description;
         defaults.add(i);
     }

[stoecker]

Hmm, do you have a "logo.png" file with the displayed image somewhere in your image search paths?

[Don-vip]

Do you have ejml plugin installed?

[Klumbumbus]

Replying to Don-vip:

Do you have ejml plugin installed?

Ahh..., yes. Thats the icon.

[Don-vip]

I just have fixed EJML plugin, please update in 10 minutes: [o35049:35050].

[Klumbumbus]

Replying to Don-vip:

I just have fixed EJML plugin, please update in 10 minutes: [o35049:35050].

Yes, that fixed it.