Changeset 12948 in josm

Timestamp:

2017-10-08T16:26:22+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15032 - MapCSS classes are not set if defined in information-level rules

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -692 +691 @@
         for (Set<TagCheck> schecks : checksCol) {
             for (TagCheck check : schecks) {
-                if (Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity) {
+                boolean ignoreError = Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity;
+                // Do not run "information" level checks if not wanted, unless they also set a MapCSS class
+                if (ignoreError && check.setClassExpressions.isEmpty()) {
                     continue;
                 }
@@ -698 +699 @@
                 if (selector != null) {
                     check.rule.declaration.execute(env);
-                    final TestError error = check.getErrorForPrimitive(p, selector, env, new MapCSSTagCheckerAndRule(check.rule));
-                    if (error != null) {
-                        r.add(error);
+                    if (!ignoreError) {
+                        final TestError error = check.getErrorForPrimitive(p, selector, env, new MapCSSTagCheckerAndRule(check.rule));
+                        if (error != null) {
+                            r.add(error);
+                        }
                     }
                 }