Changeset 9744 in josm for trunk/src/org

Timestamp:

2016-02-06T20:20:54+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12499 - detect and fix multiple spaces in tag values

File:

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

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

@@ -127 +127 @@
     protected static final int MISSPELLED_VALUE  = 1212;
     protected static final int MISSPELLED_KEY    = 1213;
+    protected static final int MULTIPLE_SPACES   = 1214;
     /** 1250 and up is used by tagcheck */
 
@@ -429 +430 @@
                 errors.add(new TestError(this, Severity.WARNING, tr("Property values start or end with white space"),
                         tr(s, key), MessageFormat.format(s, key), INVALID_SPACE, p));
+                withErrors.put(p, "SPACE");
+            }
+            if (checkValues && value != null && value.contains("  ") && !withErrors.contains(p, "SPACE")) {
+                errors.add(new TestError(this, Severity.WARNING, tr("Property values contain multiple white spaces"),
+                        tr(s, key), MessageFormat.format(s, key), MULTIPLE_SPACES, p));
                 withErrors.put(p, "SPACE");
             }
@@ -654 +660 @@
                     if (value == null || value.trim().isEmpty()) {
                         commands.add(new ChangePropertyCommand(p, key, null));
-                    } else if (value.startsWith(" ") || value.endsWith(" ")) {
+                    } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {
                         commands.add(new ChangePropertyCommand(p, key, Tag.removeWhiteSpaces(value)));
-                    } else if (key.startsWith(" ") || key.endsWith(" ")) {
+                    } else if (key.startsWith(" ") || key.endsWith(" ") || key.contains("  ")) {
                         commands.add(new ChangePropertyKeyCommand(p, key, Tag.removeWhiteSpaces(key)));
                     } else {
@@ -681 +687 @@
             int code = testError.getCode();
             return code == INVALID_KEY || code == EMPTY_VALUES || code == INVALID_SPACE ||
-                   code == INVALID_KEY_SPACE || code == INVALID_HTML || code == MISSPELLED_VALUE;
+                   code == INVALID_KEY_SPACE || code == INVALID_HTML || code == MISSPELLED_VALUE ||
+                   code == MULTIPLE_SPACES;
         }