Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 14726) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 14727) @@ -20,7 +20,4 @@ import java.util.Map.Entry; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; import javax.swing.JCheckBox; @@ -34,6 +31,4 @@ import org.openstreetmap.josm.data.osm.AbstractPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.OsmPrimitiveType; -import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.data.osm.Tagged; @@ -79,5 +74,4 @@ /** The TagChecker data */ - private static final List checkerData = new ArrayList<>(); private static final List ignoreDataStartsWith = new ArrayList<>(); private static final Set ignoreDataEquals = new HashSet<>(); @@ -135,4 +129,5 @@ protected boolean checkKeys; protected boolean checkValues; + /** Was used for special configuration file, might be used to disable value spell checker. */ protected boolean checkComplex; protected boolean checkFixmes; @@ -167,9 +162,8 @@ protected static final int MISSPELLED_VALUE_NO_FIX = 1215; // CHECKSTYLE.ON: SingleSpaceSeparator - // 1250 and up is used by TagCheckLevel in class CheckerData protected EditableList sourcesList; - private static final List DEFAULT_SOURCES = Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE); + private static final List DEFAULT_SOURCES = Arrays.asList(IGNORE_FILE, SPELL_FILE); /** @@ -219,5 +213,4 @@ */ private static void initializeData() throws IOException { - checkerData.clear(); ignoreDataStartsWith.clear(); ignoreDataEquals.clear(); @@ -243,7 +236,5 @@ if (line.startsWith("# JOSM TagChecker")) { tagcheckerfile = true; - if (!DEFAULT_SOURCES.contains(source)) { - Logging.info(tr("Adding {0} to tag checker", source)); - } + Logging.error(tr("Ignoring {0}. Support was dropped", source)); } else if (line.startsWith("# JOSM IgnoreTags")) { @@ -256,14 +247,5 @@ parseIgnoreFileLine(source, line); } else if (tagcheckerfile) { - if (!line.isEmpty()) { - CheckerData d = new CheckerData(); - String err = d.getData(line); - - if (err == null) { - checkerData.add(d); - } else { - Logging.error(tr("Invalid tagchecker line - {0}: {1}", err, line)); - } - } + // ignore } else if (line.charAt(0) == '+') { okValue = line.substring(1); @@ -394,4 +376,10 @@ } + /** + * Get set of preset values for the given key. + * @param key the key + * @return null if key is not in presets or in additionalPresetsValueData, + * else a set which might be empty. + */ private static Set getPresetValues(String key) { Set res = TaggingPresets.getPresetValues(key); @@ -400,4 +388,5 @@ if (additionalPresetsValueData.contains(key)) return Collections.emptySet(); + // null means key is not known return null; } @@ -490,17 +479,4 @@ // Just a collection to know if a primitive has been already marked with error MultiMap withErrors = new MultiMap<>(); - - if (checkComplex) { - Map keys = p.getKeys(); - for (CheckerData d : checkerData) { - if (d.match(p, keys)) { - errors.add(TestError.builder(this, d.getSeverity(), d.getCode()) - .message(tr("Suspicious tag/value combinations"), d.getDescription()) - .primitives(p) - .build()); - withErrors.put(p, "TC"); - } - } - } for (Entry prop : p.getKeys().entrySet()) { @@ -651,8 +627,11 @@ return; String fixedValue = null; + List> sets = new ArrayList<>(); Set presetValues = getPresetValues(key); - Set oftenUsedValues = oftenUsedTags.get(key); - for (Set possibleValues: Arrays.asList(presetValues, oftenUsedValues)) { - if (possibleValues != null && possibleValues.contains(harmonizedValue)) { + if (presetValues != null) + sets.add(presetValues); + sets.add(oftenUsedTags.get(key)); + for (Set possibleValues: sets) { + if (possibleValues.contains(harmonizedValue)) { fixedValue = harmonizedValue; break; @@ -665,7 +644,5 @@ int minDist = MAX_LEVENSHTEIN_DISTANCE + 1; String closest = null; - for (Set possibleValues: Arrays.asList(presetValues, oftenUsedValues)) { - if (possibleValues == null) - continue; + for (Set possibleValues: sets) { for (String possibleVal : possibleValues) { if (possibleVal.isEmpty()) @@ -765,5 +742,5 @@ } - checkComplex = Config.getPref().getBoolean(PREF_CHECK_COMPLEX, true) && !checkerData.isEmpty(); + checkComplex = Config.getPref().getBoolean(PREF_CHECK_COMPLEX, true); if (isBeforeUpload) { checkComplex = checkComplex && Config.getPref().getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true); @@ -911,184 +888,3 @@ return false; } - - protected static class CheckerData { - private String description; - protected List data = new ArrayList<>(); - private OsmPrimitiveType type; - private TagCheckLevel level; - protected Severity severity; - - private enum TagCheckLevel { - TAG_CHECK_ERROR(1250), - TAG_CHECK_WARN(1260), - TAG_CHECK_INFO(1270); - - final int code; - - TagCheckLevel(int code) { - this.code = code; - } - } - - protected static class CheckerElement { - Object tag; - Object value; - boolean noMatch; - boolean tagAll; - boolean valueAll; - boolean valueBool; - - private static Pattern getPattern(String str) { - if (str.endsWith("/i")) - return Pattern.compile(str.substring(1, str.length()-2), Pattern.CASE_INSENSITIVE); - if (str.endsWith("/")) - return Pattern.compile(str.substring(1, str.length()-1)); - - throw new IllegalStateException(); - } - - CheckerElement(String exp) { - Matcher m = Pattern.compile("(.+)([!=]=)(.+)").matcher(exp); - m.matches(); - - String n = m.group(1).trim(); - - if ("*".equals(n)) { - tagAll = true; - } else { - tag = n.startsWith("/") ? getPattern(n) : n; - noMatch = "!=".equals(m.group(2)); - n = m.group(3).trim(); - switch (n) { - case "*": valueAll = true; break; - case "BOOLEAN_TRUE": - valueBool = true; - value = OsmUtils.TRUE_VALUE; - break; - case "BOOLEAN_FALSE": - valueBool = true; - value = OsmUtils.FALSE_VALUE; - break; - default: - value = n.startsWith("/") ? getPattern(n) : n; - } - } - } - - boolean match(Map keys) { - for (Entry prop: keys.entrySet()) { - String key = prop.getKey(); - String val = valueBool ? OsmUtils.getNamedOsmBoolean(prop.getValue()) : prop.getValue(); - if ((tagAll || (tag instanceof Pattern ? ((Pattern) tag).matcher(key).matches() : key.equals(tag))) - && (valueAll || (value instanceof Pattern ? ((Pattern) value).matcher(val).matches() : val.equals(value)))) - return !noMatch; - } - return noMatch; - } - } - - private static final Pattern CLEAN_STR_PATTERN = Pattern.compile(" *# *([^#]+) *$"); - private static final Pattern SPLIT_TRIMMED_PATTERN = Pattern.compile(" *: *"); - private static final Pattern SPLIT_ELEMENTS_PATTERN = Pattern.compile(" *&& *"); - - public String getData(final String str) { - Matcher m = CLEAN_STR_PATTERN.matcher(str); - String trimmed = m.replaceFirst("").trim(); - try { - description = m.group(1); - if (description != null && description.isEmpty()) { - description = null; - } - } catch (IllegalStateException e) { - Logging.error(e); - description = null; - } - String[] n = SPLIT_TRIMMED_PATTERN.split(trimmed, 3); - switch (n[0]) { - case "way": - type = OsmPrimitiveType.WAY; - break; - case "node": - type = OsmPrimitiveType.NODE; - break; - case "relation": - type = OsmPrimitiveType.RELATION; - break; - case "*": - type = null; - break; - default: - return tr("Could not find element type"); - } - if (n.length != 3) - return tr("Incorrect number of parameters"); - - switch (n[1]) { - case "W": - severity = Severity.WARNING; - level = TagCheckLevel.TAG_CHECK_WARN; - break; - case "E": - severity = Severity.ERROR; - level = TagCheckLevel.TAG_CHECK_ERROR; - break; - case "I": - severity = Severity.OTHER; - level = TagCheckLevel.TAG_CHECK_INFO; - break; - default: - return tr("Could not find warning level"); - } - for (String exp: SPLIT_ELEMENTS_PATTERN.split(n[2])) { - try { - data.add(new CheckerElement(exp)); - } catch (IllegalStateException e) { - Logging.trace(e); - return tr("Illegal expression ''{0}''", exp); - } catch (PatternSyntaxException e) { - Logging.trace(e); - return tr("Illegal regular expression ''{0}''", exp); - } - } - return null; - } - - public boolean match(OsmPrimitive osm, Map keys) { - if (type != null && OsmPrimitiveType.from(osm) != type) - return false; - - for (CheckerElement ce : data) { - if (!ce.match(keys)) - return false; - } - return true; - } - - /** - * Returns the error description. - * @return the error description - */ - public String getDescription() { - return description; - } - - /** - * Returns the error severity. - * @return the error severity - */ - public Severity getSeverity() { - return severity; - } - - /** - * Returns the error code. - * @return the error code - */ - public int getCode() { - if (type == null) - return level.code; - - return level.code + type.ordinal() + 1; - } - } }