Changeset 16384 in josm

Timestamp:

2020-04-28T22:24:06+02:00 (4 years ago)

Author:

simon04

Message:

see #19074 - TagInfoExtract: include optional tags of preset <text>s, omit values of tags with >50 different values

File:

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

trunk/scripts/TagInfoExtract.java

@@ -275 +275 @@
                                 : Stream.empty())
                         .forEach(item -> {
-                            for (String value : item.getValues()) {
+                            for (String value : values(item)) {
                                 Set<TagInfoTag.Type> types = TagInfoTag.Type.forPresetTypes(preset.types);
                                 if (item.isKeyRequired()) {
@@ -297 +297 @@
             tags.addAll(optionalTags.values());
             return tags;
+        }
+
+        private Collection<String> values(KeyedItem item) {
+            final Collection<String> values = item.getValues();
+            return values.isEmpty() || values.size() > 50 ? Collections.singleton(null) : values;
         }
 
@@ -568 +573 @@
             }
             object.add("key", key);
-            object.add("value", value);
+            if (value != null) {
+                object.add("value", value);
+            }
             if ((!objectTypes.isEmpty())) {
                 final JsonArrayBuilder types = Json.createArrayBuilder();