Ticket #17219: 17219-v2.patch

src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -395 +395 @@
      * @since 9023
      */
     public static boolean isKeyInPresets(String key) {
-        return getPresetValues(key) != null;
+        return TaggingPresets.getPresetValues(key) != null;
     }
 
     /**
@@ -407 +407 @@
      */
     public static boolean isTagInPresets(String key, String value) {
         final Set<String> values = getPresetValues(key);
-        return values != null && (values.isEmpty() || values.contains(value));
+        return values != null && values.contains(value);
     }
 
     /**
@@ -451 +451 @@
     public static boolean isTagIgnored(String key, String value) {
         if (isKeyIgnored(key))
             return true;
+        final Set<String> values = getPresetValues(key);
+        if (values != null && values.isEmpty())
+            return true;
         if (!isTagInPresets(key, value)) {
             for (Tag a : ignoreDataTag) {
                 if (key.equals(a.getKey()) && value.equals(a.getValue())) {