Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15103) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15104) @@ -38,8 +38,5 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.INode; import org.openstreetmap.josm.data.osm.IPrimitive; -import org.openstreetmap.josm.data.osm.IRelation; -import org.openstreetmap.josm.data.osm.IWay; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmUtils; @@ -86,5 +83,4 @@ import org.openstreetmap.josm.tools.GeoPropertyIndex; import org.openstreetmap.josm.tools.I18n; -import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.MultiMap; @@ -97,155 +93,7 @@ */ public class MapCSSTagChecker extends Test.TagTest { - IndexData indexData; + MapCSSTagCheckerIndex indexData; final Set tested = new HashSet<>(); - private static final boolean ALL_TESTS = true; - private static final boolean ONLY_SELECTED_TESTS = false; - - /** - * Helper class to store indexes of rules. - * @author Gerd - * - */ - private static final class IndexData { - final Map ruleToCheckMap = new HashMap<>(); - - /** - * Rules for nodes - */ - final MapCSSRuleIndex nodeRules = new MapCSSRuleIndex(); - /** - * Rules for ways without tag area=no - */ - final MapCSSRuleIndex wayRules = new MapCSSRuleIndex(); - /** - * Rules for ways with tag area=no - */ - final MapCSSRuleIndex wayNoAreaRules = new MapCSSRuleIndex(); - /** - * Rules for relations that are not multipolygon relations - */ - final MapCSSRuleIndex relationRules = new MapCSSRuleIndex(); - /** - * Rules for multipolygon relations - */ - final MapCSSRuleIndex multipolygonRules = new MapCSSRuleIndex(); - - private IndexData(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { - buildIndex(checks, includeOtherSeverity, allTests); - } - - private void buildIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { - List allChecks = new ArrayList<>(); - for (Set cs : checks.values()) { - allChecks.addAll(cs); - } - - ruleToCheckMap.clear(); - nodeRules.clear(); - wayRules.clear(); - wayNoAreaRules.clear(); - relationRules.clear(); - multipolygonRules.clear(); - - // optimization: filter rules for different primitive types - for (TagCheck c : allChecks) { - if (!includeOtherSeverity && Severity.OTHER == c.getSeverity() - && c.setClassExpressions.isEmpty()) { - // Ignore "information" level checks if not wanted, unless they also set a MapCSS class - continue; - } - - for (Selector s : c.rule.selectors) { - // find the rightmost selector, this must be a GeneralSelector - boolean hasLeftRightSel = false; - Selector selRightmost = s; - while (selRightmost instanceof Selector.ChildOrParentSelector) { - hasLeftRightSel = true; - selRightmost = ((Selector.ChildOrParentSelector) selRightmost).right; - } - if (!allTests && !hasLeftRightSel) { - continue; - } - - MapCSSRule optRule = new MapCSSRule(s.optimizedBaseCheck(), c.rule.declaration); - - ruleToCheckMap.put(optRule, c); - final String base = ((GeneralSelector) selRightmost).getBase(); - switch (base) { - case Selector.BASE_NODE: - nodeRules.add(optRule); - break; - case Selector.BASE_WAY: - wayNoAreaRules.add(optRule); - wayRules.add(optRule); - break; - case Selector.BASE_AREA: - wayRules.add(optRule); - multipolygonRules.add(optRule); - break; - case Selector.BASE_RELATION: - relationRules.add(optRule); - multipolygonRules.add(optRule); - break; - case Selector.BASE_ANY: - nodeRules.add(optRule); - wayRules.add(optRule); - wayNoAreaRules.add(optRule); - relationRules.add(optRule); - multipolygonRules.add(optRule); - break; - case Selector.BASE_CANVAS: - case Selector.BASE_META: - case Selector.BASE_SETTING: - break; - default: - final RuntimeException e = new JosmRuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base)); - Logging.warn(tr("Failed to index validator rules. Error was: {0}", e.getMessage())); - Logging.error(e); - } - } - } - nodeRules.initIndex(); - wayRules.initIndex(); - wayNoAreaRules.initIndex(); - relationRules.initIndex(); - multipolygonRules.initIndex(); - } - - /** - * Get the index of rules for the given primitive. - * @param p the primitve - * @return index of rules for the given primitive - */ - public MapCSSRuleIndex get(OsmPrimitive p) { - if (p instanceof INode) { - return nodeRules; - } else if (p instanceof IWay) { - if (OsmUtils.isFalse(p.get("area"))) { - return wayNoAreaRules; - } else { - return wayRules; - } - } else if (p instanceof IRelation) { - if (((IRelation) p).isMultipolygon()) { - return multipolygonRules; - } else { - return relationRules; - } - } else { - throw new IllegalArgumentException("Unsupported type: " + p); - } - } - - /** - * return the TagCheck for which the given indexed rule was created. - * @param rule an indexed rule - * @return the original TagCheck - */ - public TagCheck getCheck(MapCSSRule rule) { - return ruleToCheckMap.get(rule); - } - } /** @@ -860,6 +708,7 @@ public synchronized Collection getErrorsForPrimitive(OsmPrimitive p, boolean includeOtherSeverity) { final List res = new ArrayList<>(); - if (indexData == null) - indexData = new IndexData(checks, includeOtherSeverity, ALL_TESTS); + if (indexData == null) { + indexData = new MapCSSTagCheckerIndex(checks, includeOtherSeverity, MapCSSTagCheckerIndex.ALL_TESTS); + } MapCSSRuleIndex matchingRuleIndex = indexData.get(p); @@ -1140,5 +989,5 @@ super.setShowElements(true); if (indexData == null) { - indexData = new IndexData(checks, includeOtherSeverityChecks(), ALL_TESTS); + indexData = new MapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ALL_TESTS); } tested.clear(); @@ -1153,5 +1002,5 @@ // rebuild index with a reduced set of rules (those that use ChildOrParentSelector) and thus may have left selectors // matching the previously tested elements - indexData = new IndexData(checks, includeOtherSeverityChecks(), ONLY_SELECTED_TESTS); + indexData = new MapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ONLY_SELECTED_TESTS); Set surrounding = new HashSet<>(); @@ -1164,5 +1013,5 @@ final boolean includeOtherSeverity = includeOtherSeverityChecks(); for (OsmPrimitive p : surrounding) { - if (tested.contains(p) ) + if (tested.contains(p)) continue; Collection additionalErrors = getErrorsForPrimitive(p, includeOtherSeverity); Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java (revision 15104) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java (revision 15104) @@ -0,0 +1,175 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.validation.tests; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.openstreetmap.josm.data.osm.INode; +import org.openstreetmap.josm.data.osm.IRelation; +import org.openstreetmap.josm.data.osm.IWay; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.OsmUtils; +import org.openstreetmap.josm.data.validation.Severity; +import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck; +import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule; +import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex; +import org.openstreetmap.josm.gui.mappaint.mapcss.Selector; +import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector; +import org.openstreetmap.josm.tools.JosmRuntimeException; +import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.MultiMap; + +/** + * Helper class for {@link MapCSSTagChecker} to store indexes of rules + * @author Gerd + * + */ +final class MapCSSTagCheckerIndex { + final Map ruleToCheckMap = new HashMap<>(); + + static final boolean ALL_TESTS = true; + static final boolean ONLY_SELECTED_TESTS = false; + + /** + * Rules for nodes + */ + final MapCSSRuleIndex nodeRules = new MapCSSRuleIndex(); + /** + * Rules for ways without tag area=no + */ + final MapCSSRuleIndex wayRules = new MapCSSRuleIndex(); + /** + * Rules for ways with tag area=no + */ + final MapCSSRuleIndex wayNoAreaRules = new MapCSSRuleIndex(); + /** + * Rules for relations that are not multipolygon relations + */ + final MapCSSRuleIndex relationRules = new MapCSSRuleIndex(); + /** + * Rules for multipolygon relations + */ + final MapCSSRuleIndex multipolygonRules = new MapCSSRuleIndex(); + + MapCSSTagCheckerIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { + buildIndex(checks, includeOtherSeverity, allTests); + } + + private void buildIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { + List allChecks = new ArrayList<>(); + for (Set cs : checks.values()) { + allChecks.addAll(cs); + } + + ruleToCheckMap.clear(); + nodeRules.clear(); + wayRules.clear(); + wayNoAreaRules.clear(); + relationRules.clear(); + multipolygonRules.clear(); + + // optimization: filter rules for different primitive types + for (TagCheck c : allChecks) { + if (!includeOtherSeverity && Severity.OTHER == c.getSeverity() + && c.setClassExpressions.isEmpty()) { + // Ignore "information" level checks if not wanted, unless they also set a MapCSS class + continue; + } + + for (Selector s : c.rule.selectors) { + // find the rightmost selector, this must be a GeneralSelector + boolean hasLeftRightSel = false; + Selector selRightmost = s; + while (selRightmost instanceof Selector.ChildOrParentSelector) { + hasLeftRightSel = true; + selRightmost = ((Selector.ChildOrParentSelector) selRightmost).right; + } + if (!allTests && !hasLeftRightSel) { + continue; + } + + MapCSSRule optRule = new MapCSSRule(s.optimizedBaseCheck(), c.rule.declaration); + + ruleToCheckMap.put(optRule, c); + final String base = ((GeneralSelector) selRightmost).getBase(); + switch (base) { + case Selector.BASE_NODE: + nodeRules.add(optRule); + break; + case Selector.BASE_WAY: + wayNoAreaRules.add(optRule); + wayRules.add(optRule); + break; + case Selector.BASE_AREA: + wayRules.add(optRule); + multipolygonRules.add(optRule); + break; + case Selector.BASE_RELATION: + relationRules.add(optRule); + multipolygonRules.add(optRule); + break; + case Selector.BASE_ANY: + nodeRules.add(optRule); + wayRules.add(optRule); + wayNoAreaRules.add(optRule); + relationRules.add(optRule); + multipolygonRules.add(optRule); + break; + case Selector.BASE_CANVAS: + case Selector.BASE_META: + case Selector.BASE_SETTING: + break; + default: + final RuntimeException e = new JosmRuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base)); + Logging.warn(tr("Failed to index validator rules. Error was: {0}", e.getMessage())); + Logging.error(e); + } + } + } + nodeRules.initIndex(); + wayRules.initIndex(); + wayNoAreaRules.initIndex(); + relationRules.initIndex(); + multipolygonRules.initIndex(); + } + + /** + * Get the index of rules for the given primitive. + * @param p the primitve + * @return index of rules for the given primitive + */ + public MapCSSRuleIndex get(OsmPrimitive p) { + if (p instanceof INode) { + return nodeRules; + } else if (p instanceof IWay) { + if (OsmUtils.isFalse(p.get("area"))) { + return wayNoAreaRules; + } else { + return wayRules; + } + } else if (p instanceof IRelation) { + if (((IRelation) p).isMultipolygon()) { + return multipolygonRules; + } else { + return relationRules; + } + } else { + throw new IllegalArgumentException("Unsupported type: " + p); + } + } + + /** + * return the TagCheck for which the given indexed rule was created. + * @param rule an indexed rule + * @return the original TagCheck + */ + public TagCheck getCheck(MapCSSRule rule) { + return ruleToCheckMap.get(rule); + } +}