Changeset 14571 in josm

Timestamp:

2018-12-17T15:08:05+01:00 (5 years ago)

Author:

GerdP

Message:

see #17055 When harmonized value is only 3 characters reduce allowed Levenshtein distance from 2 to 1.

When shop=gas is not in presets, we don't want a message like "Value 'gas' for key 'shop' looks like one of [bag, car, yes]."
just because one character of those values matches.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (1 diff)

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

@@ -567 +567 @@
                             }
                         }
-                        if (minDist <= MAX_LEVENSHTEIN_DISTANCE && maxPresetValueLen > MAX_LEVENSHTEIN_DISTANCE) {
+                        if (minDist <= MAX_LEVENSHTEIN_DISTANCE && maxPresetValueLen > MAX_LEVENSHTEIN_DISTANCE
+                                && (harmonizedValue.length() > 3 || minDist < MAX_LEVENSHTEIN_DISTANCE)) {
                             if (fixVals.size() < 2) {
                                 fixedValue = closest;
@@ -575 +576 @@
                                 errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE_NO_FIX)
                                         .message(tr("Misspelled property value"),
-                                                marktr("Value ''{0}'' for key ''{1}'' looks like one of {2}."), prop.getValue(), key, fixVals)
-                                        .primitives(p)
-                                        .build());
+                                                marktr("Value ''{0}'' for key ''{1}'' looks like one of {2}."),
+                                                prop.getValue(), key, fixVals)
+                                        .primitives(p).build());
                                 withErrors.put(p, "WPV");
                                 continue;

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -154 +154 @@
 
     /**
+     * Check for misspelled value.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testShortValNotInPreset2() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("node shop=gas"));
+        assertEquals(1, errors.size());
+        assertEquals("Presets do not contain property value", errors.get(0).getMessage());
+        assertEquals("Value 'gas' for key 'shop' not in presets.", errors.get(0).getDescription());
+        assertEquals(Severity.OTHER, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+    }
+
+    /**
      * Checks that tags specifically ignored are effectively not in internal presets.
      * @throws IOException if any I/O error occurs