Changeset 5379 in josm

Timestamp:

Jul 28, 2012 11:16:44 PM (11 months ago)

Author:

bastiK

Message:

fixed #5679 - Validator: value of name tag not in presets if a preset specifies a name value

(respect key ignore rules E, S and F also for tags where some value for this key is found in the presets)

Location:

trunk

Files:

• data/ignoretags.cfg (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (1 diff)

trunk/data/ignoretags.cfg

@@ -18 +18 @@
 ; Ignore valid and semi-valid keys that equal...
 ;
+E:name
 E:loc_name
 E:attribution

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

@@ -458 +458 @@
             }
             if (checkValues && value != null && value.length() > 0 && presetsValueData != null) {
-                Set<String> values = presetsValueData.get(key);
-                if (values == null) {
-                    boolean ignore = false;
-                    for (String a : ignoreDataStartsWith) {
-                        if (key.startsWith(a)) {
-                            ignore = true;
-                        }
-                    }
-                    for (String a : ignoreDataEquals) {
-                        if(key.equals(a)) {
-                            ignore = true;
-                        }
-                    }
-                    for (String a : ignoreDataEndsWith) {
-                        if(key.endsWith(a)) {
-                            ignore = true;
-                        }
-                    }
-                    if (!ignore) {
-                        String i = marktr("Key ''{0}'' not in presets.");
-                        errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
-                                tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
-                        withErrors.put(p, "UPK");
-                    }
-                } else if (values.size() > 0 && !values.contains(prop.getValue())) {
-                    boolean ignore = false;
-                    for (IgnoreKeyPair a : ignoreDataKeyPair) {
-                        if (key.equals(a.key) && value.equals(a.value)) {
-                            ignore = true;
-                        }
-                    }
-
-                    for (IgnoreTwoKeyPair a : ignoreDataTwoKeyPair) {
-                        if (key.equals(a.key2) && value.equals(a.value2)) {
-                            ignore = true;
-                        }
-                    }
-
-                    if (!ignore) {
-                        String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
-                        errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
-                                tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
-                        withErrors.put(p, "UPV");
+                boolean ignore = false;
+                for (String a : ignoreDataStartsWith) {
+                    if (key.startsWith(a)) {
+                        ignore = true;
+                    }
+                }
+                for (String a : ignoreDataEquals) {
+                    if(key.equals(a)) {
+                        ignore = true;
+                    }
+                }
+                for (String a : ignoreDataEndsWith) {
+                    if(key.endsWith(a)) {
+                        ignore = true;
+                    }
+                }
+                if (!ignore) {
+                    String i = marktr("Key ''{0}'' not in presets.");
+                    errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property key"),
+                            tr(i, key), MessageFormat.format(i, key), INVALID_VALUE, p) );
+                    withErrors.put(p, "UPK");
+                } else {
+                    Set<String> values = presetsValueData.get(key);
+                    if (values != null && values.size() > 0 && !values.contains(prop.getValue())) {
+                        ignore = false;
+                        for (IgnoreKeyPair a : ignoreDataKeyPair) {
+                            if (key.equals(a.key) && value.equals(a.value)) {
+                                ignore = true;
+                            }
+                        }
+
+                        for (IgnoreTwoKeyPair a : ignoreDataTwoKeyPair) {
+                            if (key.equals(a.key2) && value.equals(a.value2)) {
+                                ignore = true;
+                            }
+                        }
+
+                        if (!ignore) {
+                            String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
+                            errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
+                                    tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
+                            withErrors.put(p, "UPV");
+                        }
                     }
                 }