Changeset 16269 in josm for trunk

Timestamp:

2020-04-12T14:55:05+02:00 (4 years ago)

Author:

simon04

Message:

Extract TagInfoExtract.TagInfoTag.Type#forPresetType

File:

• trunk/scripts/TagInfoExtract.java (modified) (2 diffs)

trunk/scripts/TagInfoExtract.java

@@ -268 +268 @@
                             : Collections.emptyList();
                     for (String value : values) {
-                        final Set<TagInfoTag.Type> types = preset.types == null ? Collections.emptySet() : preset.types.stream()
-                                .map(it -> TaggingPresetType.CLOSEDWAY.equals(it)
-                                        ? TagInfoTag.Type.AREA
-                                        : TaggingPresetType.MULTIPOLYGON.equals(it)
-                                        ? TagInfoTag.Type.RELATION
-                                        : TagInfoTag.Type.valueOf(it.toString()))
-                                .collect(Collectors.toCollection(() -> EnumSet.noneOf(TagInfoTag.Type.class)));
+                        final Set<TagInfoTag.Type> types = TagInfoTag.Type.forPresetTypes(preset.types);
                         tags.add(new TagInfoTag(descriptionPrefix + preset.getName(), item.key, value, types,
                                 addImages && preset.iconName != null ? options.findImageUrl(preset.iconName) : null));
@@ -563 +557 @@
 
         enum Type {
-            NODE, WAY, AREA, RELATION
+            NODE, WAY, AREA, RELATION;
+
+            static TagInfoTag.Type forPresetType(TaggingPresetType type) {
+                switch (type) {
+                    case CLOSEDWAY:
+                        return AREA;
+                    case MULTIPOLYGON:
+                        return RELATION;
+                    default:
+                        return valueOf(type.toString());
+                }
+            }
+
+            static Set<TagInfoTag.Type> forPresetTypes(Set<TaggingPresetType> types) {
+                if (types == null) {
+                    return Collections.emptySet();
+                }
+                return types.stream()
+                        .map(Type::forPresetType)
+                        .collect(Collectors.toCollection(() -> EnumSet.noneOf(Type.class)));
+            }
         }
     }