Ticket #11498: patch2.diff

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

@@ -420 +420 @@
                     } else if (!tagInPresets) {
                         // try to fix common typos and check again if value is still unknown
                         String fixedValue = prettifyValue(prop.getValue());
-                        if (values != null && values.contains(fixedValue)) {
+                        HashMap<String, String> possibleValues = getPossibleValues(values);
+                        if (possibleValues.containsKey(fixedValue)) {
+                            fixedValue = possibleValues.get(fixedValue);
                             // misspelled preset value
                             String i = marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}}.");
                             errors.add(new FixableTestError(this, Severity.WARNING, tr("Misspelled property value"),
@@ -450 +452 @@
         }
     }
 
+    private HashMap<String, String> getPossibleValues(Set<String> values) {
+        // generate a map with common typos
+        HashMap<String, String> map = new HashMap<>();
+        if (values != null) {
+            for (String value : values) {
+                map.put(value, value);
+                if (value.contains("_")) {
+                    map.put(value.replace("_", ""), value);
+                }
+            }
+        }
+        return map;
+    }
+
     private static String prettifyValue(String value) {
         // convert to lower case, replace ' ' or '-' with '_'
         value = value.toLowerCase(Locale.ENGLISH).replace('-', '_').replace(' ', '_');