Changeset 14897 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2019-03-18T09:10:55+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17468: Validator produces wrong warning for misspelled tag key

TODO: further improve words.cfg

File:

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

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

@@ -297 +297 @@
             case "E:":
                 ignoreDataEquals.add(line);
+                addToKeyDictionary(line);
                 break;
             case "F:":
@@ -305 +306 @@
                 ignoreDataTag.add(tag);
                 oftenUsedTags.put(tag.getKey(), tag.getValue());
+                addToKeyDictionary(tag.getKey());
                 break;
             default:
@@ -314 +316 @@
             Logging.error("Invalid line in {0} : {1}", source, e.getMessage());
             Logging.trace(e);
+        }
+    }
+
+    private static void addToKeyDictionary(String key) {
+        if (key != null) {
+            String hk = harmonizeKey(key);
+            if (!key.equals(hk)) {
+                harmonizedKeys.put(hk, key);
+            }
         }
     }
@@ -356 +367 @@
     private static void addPresetValue(KeyedItem ky) {
         if (ky.key != null && ky.getValues() != null) {
-            String hk = harmonizeKey(ky.key);
-            if (!ky.key.equals(hk)) {
-                harmonizedKeys.put(hk, ky.key);
-            }
+            addToKeyDictionary(ky.key);
         }
     }
@@ -602 +610 @@
     private void spellCheckKey(MultiMap<OsmPrimitive, String> withErrors, OsmPrimitive p, String key) {
         String prettifiedKey = harmonizeKey(key);
-        String fixedKey = isKeyInPresets(prettifiedKey) ? prettifiedKey : harmonizedKeys.get(prettifiedKey);
+        String fixedKey;
+        if (ignoreDataEquals.contains(prettifiedKey)) {
+            fixedKey = prettifiedKey;
+        } else {
+            fixedKey = isKeyInPresets(prettifiedKey) ? prettifiedKey : harmonizedKeys.get(prettifiedKey);
+        }
+        if (fixedKey == null) {
+            for (Tag a : ignoreDataTag) {
+                if (a.getKey().equals(prettifiedKey)) {
+                    fixedKey = prettifiedKey;
+                    break;
+                }
+            }
+        }
+
         if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
+            final String proposedKey = fixedKey;
             // misspelled preset key
             final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
-                    .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
+                    .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, proposedKey)
                     .primitives(p);
             if (p.hasKey(fixedKey)) {
                 errors.add(error.build());
             } else {
-                errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
+                errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, proposedKey)).build());
             }
             withErrors.put(p, "WPK");