Changeset 8438 in josm for trunk/src

Timestamp:

2015-06-01T18:04:14+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11498 - Warn about obvious misspelled tag values (modified patch by mdk) + i18n fix

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (2 diffs)

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

@@ -421 +421 @@
                         // try to fix common typos and check again if value is still unknown
                         String fixedValue = prettifyValue(prop.getValue());
-                        if (values != null && values.contains(fixedValue)) {
+                        Map<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}}.");
+                            String i = marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''.");
                             errors.add(new FixableTestError(this, Severity.WARNING, tr("Misspelled property value"),
                                     tr(i, prop.getValue(), key, fixedValue), MessageFormat.format(i, prop.getValue(), fixedValue),
@@ -449 +451 @@
             }
         }
+    }
+
+    private Map<String, String> getPossibleValues(Set<String> values) {
+        // generate a map with common typos
+        Map<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;
     }