Ticket #7811: tagchecker2.patch

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

@@ -361 +361 @@
         MultiMap<OsmPrimitive, String> withErrors = new MultiMap<OsmPrimitive, String>();
 
         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) {
                 if (d.match(p, keys)) {