Changeset 5475 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-08-24T13:24:55+02:00 (12 years ago)

Author:

bastiK

Message:

applied #7811 - Vague "Suspicious tag/value combinations" message for absent denomination tag (patch by mrwojo, slightly modified)

File:

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

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

@@ -83 +83 @@
     protected static final List<String> ignoreDataEndsWith = new ArrayList<String>();
     protected static final List<IgnoreKeyPair> ignoreDataKeyPair = new ArrayList<IgnoreKeyPair>();
-    protected static final List<IgnoreTwoKeyPair> ignoreDataTwoKeyPair = new ArrayList<IgnoreTwoKeyPair>();
 
     /** The preferences prefix */
@@ -175 +174 @@
         ignoreDataEndsWith.clear();
         ignoreDataKeyPair.clear();
-        ignoreDataTwoKeyPair.clear();
 
         spellCheckKeyData = new HashMap<String, String>();
@@ -249 +247 @@
                             tmp.value = line.substring(mid+1);
                             ignoreDataKeyPair.add(tmp);
-                        } else if (key.equals("T:")) {
-                            IgnoreTwoKeyPair tmp = new IgnoreTwoKeyPair();
-                            int mid = line.indexOf("=");
-                            int split = line.indexOf("|");
-                            tmp.key1 = line.substring(0, mid);
-                            tmp.value1 = line.substring(mid+1, split);
-                            line = line.substring(split+1);
-                            mid = line.indexOf("=");
-                            tmp.key2 = line.substring(0, mid);
-                            tmp.value2 = line.substring(mid+1);
-                            ignoreDataTwoKeyPair.add(tmp);
                         }
                         continue;
@@ -362 +349 @@
 
         if (checkComplex) {
-            Map<String, String> props = (p.getKeys() == null) ? Collections.<String, String>emptyMap() : p.getKeys();
-            for (Entry<String, String> prop : props.entrySet()) {
-                boolean ignore = true;
-                String key1 = prop.getKey();
-                String value1 = prop.getValue();
-
-                for (IgnoreTwoKeyPair a : ignoreDataTwoKeyPair) {
-                    if (key1.equals(a.key1) && value1.equals(a.value1)) {
-                        ignore = false;
-                        for (Entry<String, String> prop2 : props.entrySet()) {
-                            String key2 = prop2.getKey();
-                            String value2 = prop2.getValue();
-                            for (IgnoreTwoKeyPair b : ignoreDataTwoKeyPair) {
-                                if (key2.equals(b.key2) && value2.equals(b.value2)) {
-                                    ignore = true;
-                                    break;
-                                }
-                            }
-                            if (ignore) {
-                                break;
-                            }
-                        }
-                    }
-                    if (ignore) {
-                        break;
-                    }
-                }
-
-                if (!ignore) {
-                    errors.add( new TestError(this, Severity.OTHER, tr("Suspicious tag/value combinations"),
-                            tr("Suspicious tag/value combinations"), tr("Suspicious tag/value combinations"), 1272, p) );
-                    withErrors.put(p, "TC");
-                }
-            }
-
             Map<String, String> keys = p.getKeys();
             for (CheckerData d : checkerData) {
@@ -482 +434 @@
                     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;
                         }
@@ -801 +747 @@
     }
 
-    protected static class IgnoreTwoKeyPair {
-        public String key1;
-        public String value1;
-        public String key2;
-        public String value2;
-    }
-
     protected static class IgnoreKeyPair {
         public String key;