Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15988) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15989) @@ -50,4 +50,5 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction; import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule; +import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleIndex; import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource; import org.openstreetmap.josm.gui.mappaint.mapcss.Selector; @@ -73,8 +74,10 @@ */ public class MapCSSTagChecker extends Test.TagTest { - private MapCSSTagCheckerIndex indexData; + private MapCSSStyleIndex indexData; final Map ruleToCheckMap = new HashMap<>(); private final Set tested = new HashSet<>(); private static final Map mpAreaCache = new HashMap<>(); + static final boolean ALL_TESTS = true; + static final boolean ONLY_SELECTED_TESTS = false; /** @@ -622,6 +625,10 @@ } - static MapCSSTagCheckerIndex createMapCSSTagCheckerIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { - final MapCSSTagCheckerIndex index = new MapCSSTagCheckerIndex(); + private static boolean hasSameDeclaration(MapCSSRule rule1, final MapCSSRule rule2) { + return Objects.equals(rule1.declaration, rule2.declaration); + } + + static MapCSSStyleIndex createMapCSSTagCheckerIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { + final MapCSSStyleIndex index = new MapCSSStyleIndex(); final Stream ruleStream = checks.values().stream() .flatMap(Collection::stream) @@ -643,5 +650,5 @@ final List res = new ArrayList<>(); if (indexData == null) { - indexData = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverity, MapCSSTagCheckerIndex.ALL_TESTS); + indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverity, ALL_TESTS); } @@ -850,5 +857,5 @@ super.setShowElements(true); if (indexData == null) { - indexData = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ALL_TESTS); + indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ALL_TESTS); } tested.clear(); @@ -864,5 +871,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 = MapCSSTagCheckerIndex.createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), MapCSSTagCheckerIndex.ONLY_SELECTED_TESTS); + indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ONLY_SELECTED_TESTS); Set surrounding = new HashSet<>(); Index: unk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerIndex.java (revision 15988) +++ (revision ) @@ -1,203 +1,0 @@ -// 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.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -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.OsmUtils; -import org.openstreetmap.josm.data.validation.Severity; -import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck; -import org.openstreetmap.josm.gui.mappaint.mapcss.Declaration; -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.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 - * - */ -public 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(); - /** - * rules to apply canvas properties - */ - final MapCSSRuleIndex canvasRules = new MapCSSRuleIndex(); - - static MapCSSTagCheckerIndex createMapCSSTagCheckerIndex(MultiMap checks, boolean includeOtherSeverity, boolean allTests) { - final MapCSSTagCheckerIndex index = new MapCSSTagCheckerIndex(); - final Stream ruleStream = checks.values().stream() - .flatMap(Collection::stream) - // Ignore "information" level checks if not wanted, unless they also set a MapCSS class - .filter(c -> includeOtherSeverity || Severity.OTHER != c.getSeverity() || !c.setClassExpressions.isEmpty()) - .filter(c -> allTests || c.rule.selectors.stream().anyMatch(Selector.ChildOrParentSelector.class::isInstance)) - .peek(c -> index.ruleToCheckMap.put(c.rule.declaration, c)) - .map(c -> c.rule); - index.buildIndex(ruleStream); - return index; - } - - /** - * Clear the index. - *

- * You must own the write lock STYLE_SOURCE_LOCK when calling this method. - */ - public void clear() { - ruleToCheckMap.clear(); - nodeRules.clear(); - wayRules.clear(); - wayNoAreaRules.clear(); - relationRules.clear(); - multipolygonRules.clear(); - canvasRules.clear(); - } - - /** - * Builds and initializes the index. - *

- * You must own the write lock of STYLE_SOURCE_LOCK when calling this method. - */ - public void buildIndex(Stream ruleStream) { - clear(); - // optimization: filter rules for different primitive types - ruleStream.forEach(rule -> { - final Map selectorsByBase = rule.selectors.stream() - .collect(Collectors.groupingBy(Selector::getBase, - Collectors.collectingAndThen(Collectors.toList(), selectors -> new MapCSSRule(selectors, rule.declaration)))); - selectorsByBase.forEach((base, optRule) -> { - 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: - canvasRules.add(optRule); - break; - case Selector.BASE_META: - case Selector.BASE_SETTING: - case Selector.BASE_SETTINGS: - 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); - } - }); - }); - initIndex(); - } - - private void initIndex() { - nodeRules.initIndex(); - wayRules.initIndex(); - wayNoAreaRules.initIndex(); - relationRules.initIndex(); - multipolygonRules.initIndex(); - canvasRules.initIndex(); - } - - /** - * Get the index of rules for the given primitive. - * @param p the primitive - * @return index of rules for the given primitive - */ - public MapCSSRuleIndex get(IPrimitive 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 if (p.hasKey("#canvas")) { - return canvasRules; - } else { - return relationRules; - } - } else { - throw new IllegalArgumentException("Unsupported type: " + p); - } - } - - /** - * Get a subset of all rules that might match the primitive. Rules not included in the result are guaranteed to - * not match this primitive. - *

- * You must have a read lock of STYLE_SOURCE_LOCK when calling this method. - * - * @param osm the primitive to match - * @return An iterator over possible rules in the right order. - */ - public Iterator getRuleCandidates(IPrimitive osm) { - return get(osm).getRuleCandidates(osm); - } - - /** - * 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.declaration); - } -} Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleIndex.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleIndex.java (revision 15989) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleIndex.java (revision 15989) @@ -0,0 +1,166 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.mappaint.mapcss; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.text.MessageFormat; +import java.util.Iterator; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +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.OsmUtils; +import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex; +import org.openstreetmap.josm.tools.JosmRuntimeException; +import org.openstreetmap.josm.tools.Logging; + +/** + * Store indexes of {@link MapCSSRule}s using {@link MapCSSRuleIndex} differentiated by {@linkplain Selector#getBase() base} + */ +public final class MapCSSStyleIndex { + + /** + * 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(); + /** + * rules to apply canvas properties + */ + final MapCSSRuleIndex canvasRules = new MapCSSRuleIndex(); + + /** + * Clear the index. + *

+ * You must own the write lock STYLE_SOURCE_LOCK when calling this method. + */ + public void clear() { + nodeRules.clear(); + wayRules.clear(); + wayNoAreaRules.clear(); + relationRules.clear(); + multipolygonRules.clear(); + canvasRules.clear(); + } + + /** + * Builds and initializes the index. + *

+ * You must own the write lock of STYLE_SOURCE_LOCK when calling this method. + */ + public void buildIndex(Stream ruleStream) { + clear(); + // optimization: filter rules for different primitive types + ruleStream.forEach(rule -> { + final Map selectorsByBase = rule.selectors.stream() + .collect(Collectors.groupingBy(Selector::getBase, + Collectors.collectingAndThen(Collectors.toList(), selectors -> new MapCSSRule(selectors, rule.declaration)))); + selectorsByBase.forEach((base, optRule) -> { + 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: + canvasRules.add(optRule); + break; + case Selector.BASE_META: + case Selector.BASE_SETTING: + case Selector.BASE_SETTINGS: + 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); + } + }); + }); + initIndex(); + } + + private void initIndex() { + nodeRules.initIndex(); + wayRules.initIndex(); + wayNoAreaRules.initIndex(); + relationRules.initIndex(); + multipolygonRules.initIndex(); + canvasRules.initIndex(); + } + + /** + * Get the index of rules for the given primitive. + * @param p the primitive + * @return index of rules for the given primitive + */ + public MapCSSRuleIndex get(IPrimitive 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 if (p.hasKey("#canvas")) { + return canvasRules; + } else { + return relationRules; + } + } else { + throw new IllegalArgumentException("Unsupported type: " + p); + } + } + + /** + * Get a subset of all rules that might match the primitive. Rules not included in the result are guaranteed to + * not match this primitive. + *

+ * You must have a read lock of STYLE_SOURCE_LOCK when calling this method. + * + * @param osm the primitive to match + * @return An iterator over possible rules in the right order. + */ + public Iterator getRuleCandidates(IPrimitive osm) { + return get(osm).getRuleCandidates(osm); + } +} Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 15988) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 15989) @@ -39,5 +39,4 @@ import org.openstreetmap.josm.data.osm.Tagged; import org.openstreetmap.josm.data.preferences.sources.SourceEntry; -import org.openstreetmap.josm.data.validation.tests.MapCSSTagCheckerIndex; import org.openstreetmap.josm.gui.mappaint.Cascade; import org.openstreetmap.josm.gui.mappaint.Environment; @@ -86,5 +85,5 @@ * Index of rules in this style file */ - private final MapCSSTagCheckerIndex ruleIndex = new MapCSSTagCheckerIndex(); + private final MapCSSStyleIndex ruleIndex = new MapCSSStyleIndex(); private Color backgroundColorOverride;