Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 16046) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 16047) @@ -6,4 +6,5 @@ import java.awt.geom.Area; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -18,4 +19,5 @@ import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; @@ -67,4 +69,5 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.MultiMap; +import org.openstreetmap.josm.tools.Stopwatch; import org.openstreetmap.josm.tools.Utils; @@ -75,6 +78,5 @@ public class MapCSSTagChecker extends Test.TagTest { private MapCSSStyleIndex indexData; - final Map ruleToCheckMap = new HashMap<>(); - private final Set tested = new HashSet<>(); + private final Map ruleToCheckMap = new HashMap<>(); private static final Map mpAreaCache = new HashMap<>(); static final boolean ALL_TESTS = true; @@ -203,4 +205,7 @@ final MultiMap checks = new MultiMap<>(); + + /** maps the source URL for a test to the title shown in the dialog where known */ + private final Map urlTitles = new HashMap<>(); /** @@ -547,6 +552,7 @@ final String description1 = group == null ? description : group; final String description2 = group == null ? null : description; + final String selector = matchingSelector.toString(); TestError.Builder errorBuilder = TestError.builder(tester, getSeverity(), 3000) - .messageWithManuallyTranslatedDescription(description1, description2, matchingSelector.toString()); + .messageWithManuallyTranslatedDescription(description1, description2, selector); if (fix != null) { errorBuilder.fix(() -> fix); @@ -558,6 +564,5 @@ if (c instanceof OsmPrimitive) { errorBuilder = TestError.builder(tester, getSeverity(), 3000) - .messageWithManuallyTranslatedDescription(description1, description2, - matchingSelector.toString()); + .messageWithManuallyTranslatedDescription(description1, description2, selector); if (fix != null) { errorBuilder.fix(() -> fix); @@ -618,5 +623,5 @@ @Override public String getSource() { - return tr("URL / File: {0}", source); + return source; } } @@ -662,5 +667,5 @@ .filter(c -> c.rule.declaration == rule.declaration) .findFirst() - .map(c -> new MapCSSTagCheckerAndRule(c, e.getKey())) + .map(c -> new MapCSSTagCheckerAndRule(c, getTitle(e.getKey()))) .orElse(null)) .filter(Objects::nonNull) @@ -681,4 +686,8 @@ } + private String getTitle(String url) { + return urlTitles.getOrDefault(url, tr("unknown")); + } + /** * See #12627 @@ -750,7 +759,4 @@ addIfNotSimilar(e, errors); } - if (partialSelection) { - tested.add(p); - } } @@ -788,7 +794,27 @@ checks.remove(url); checks.putAll(url, result.parseChecks); + urlTitles.put(url, findURLTitle(url)); indexData = null; } return result; + } + + /** Find a user friendly string for the url. + * + * @param url the source for the set of rules + * @return a value that can be used in tool tip or progress bar. + */ + private static String findURLTitle(String url) { + for (SourceEntry source : new ValidatorPrefHelper().get()) { + if (url.equals(source.url) && source.title != null && !source.title.isEmpty()) { + return source.title; + } + } + if (url.endsWith(".mapcss")) // do we have others? + url = new File(url).getName(); + if (url.length() > 33) { + url = "..." + url.substring(url.length() - 30); + } + return url; } @@ -796,4 +822,5 @@ public synchronized void initialize() throws Exception { checks.clear(); + urlTitles.clear(); indexData = null; for (SourceEntry source : new ValidatorPrefHelper().get()) { @@ -843,13 +870,75 @@ super.startTest(progressMonitor); super.setShowElements(true); - if (indexData == null) { - indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ALL_TESTS); - } - tested.clear(); - mpAreaCache.clear(); } @Override public synchronized void endTest() { + // no need to keep the index, it is quickly build and doubles the memory needs + indexData = null; + // always clear the cache to make sure that we catch changes in geometry + mpAreaCache.clear(); + ruleToCheckMap.clear(); + super.endTest(); + } + + @Override + public void visit(Collection selection) { + if (progressMonitor != null) { + progressMonitor.setTicksCount(selection.size() * checks.size()); + } + + mpAreaCache.clear(); + + Set surrounding = new HashSet<>(); + for (Entry> entry : checks.entrySet()) { + if (isCanceled()) { + break; + } + visit(entry.getKey(), entry.getValue(), selection, surrounding); + } + } + + /** + * Perform the checks for one check url + * @param url the url for the checks + * @param checksForUrl the checks to perform + * @param selection collection primitives + * @param surrounding surrounding primitives, evtl. filled by this routine + */ + private void visit(String url, Set checksForUrl, Collection selection, + Set surrounding) { + MultiMap currentCheck = new MultiMap<>(); + currentCheck.putAll(url, checksForUrl); + indexData = createMapCSSTagCheckerIndex(currentCheck, includeOtherSeverityChecks(), ALL_TESTS); + Set tested = new HashSet<>(); + + + String title = getTitle(url); + if (progressMonitor != null) { + progressMonitor.setExtraText(tr(" {0}", title)); + } + long cnt = 0; + Stopwatch stopwatch = Stopwatch.createStarted(); + for (OsmPrimitive p : selection) { + if (isCanceled()) { + break; + } + if (isPrimitiveUsable(p)) { + check(p); + if (partialSelection) { + tested.add(p); + } + } + if (progressMonitor != null) { + progressMonitor.worked(1); + cnt++; + // add frequently changing info to progress monitor so that it + // doesn't seem to hang when test takes longer than 0.5 seconds + if (cnt % 10000 == 0 && stopwatch.elapsed() >= 500) { + progressMonitor.setExtraText(tr(" {0}: {1} of {2} elements done", title, cnt, selection.size())); + } + } + } + if (partialSelection && !tested.isEmpty()) { // #14287: see https://josm.openstreetmap.de/ticket/14287#comment:15 @@ -858,13 +947,15 @@ // rebuild index with a reduced set of rules (those that use ChildOrParentSelector) and thus may have left selectors // matching the previously tested elements - indexData = createMapCSSTagCheckerIndex(checks, includeOtherSeverityChecks(), ONLY_SELECTED_TESTS); - - Set surrounding = new HashSet<>(); - for (OsmPrimitive p : tested) { - if (p.getDataSet() != null) { - surrounding.addAll(p.getDataSet().searchWays(p.getBBox())); - surrounding.addAll(p.getDataSet().searchRelations(p.getBBox())); - } - } + indexData = createMapCSSTagCheckerIndex(currentCheck, includeOtherSeverityChecks(), ONLY_SELECTED_TESTS); + + if (surrounding.isEmpty()) { + for (OsmPrimitive p : tested) { + if (p.getDataSet() != null) { + surrounding.addAll(p.getDataSet().searchWays(p.getBBox())); + surrounding.addAll(p.getDataSet().searchRelations(p.getBBox())); + } + } + } + final boolean includeOtherSeverity = includeOtherSeverityChecks(); for (OsmPrimitive p : surrounding) { @@ -877,12 +968,5 @@ } } - tested.clear(); - } - // no need to keep the index, it is quickly build and doubles the memory needs - indexData = null; - // always clear the cache to make sure that we catch changes in geometry - mpAreaCache.clear(); - ruleToCheckMap.clear(); - super.endTest(); + } } }