Changeset 9691 in josm for trunk/src/org

Timestamp:

2016-01-31T10:47:29+01:00 (9 years ago)

Author:

simon04

Message:

fix #12452 - icons in relation list display low priority icons

Prefer more specific presets w.r.t. the supported types

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -34 +34 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -40 +41 @@
 import java.util.List;
 import java.util.Map;
+import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -1346 +1348 @@
         // Check if the presets have icons for nodes/relations.
         if (!OsmPrimitiveType.WAY.equals(primitive.getType())) {
-            for (final TaggingPreset preset : TaggingPresets.getMatchingPresets(primitive)) {
+            final Collection<TaggingPreset> presets = new TreeSet<>(new Comparator<TaggingPreset>() {
+                @Override
+                public int compare(TaggingPreset o1, TaggingPreset o2) {
+                    final int o1TypesSize = o1.types == null || o1.types.isEmpty() ? Integer.MAX_VALUE : o1.types.size();
+                    final int o2TypesSize = o2.types == null || o2.types.isEmpty() ? Integer.MAX_VALUE : o2.types.size();
+                    return Integer.compare(o1TypesSize, o2TypesSize);
+                }
+            });
+            presets.addAll(TaggingPresets.getMatchingPresets(primitive));
+            for (final TaggingPreset preset : presets) {
                 if (preset.getIcon() != null) {
                     return preset.getIcon();