Changeset 6773 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-01-29T21:30:14+01:00 (10 years ago)

Author:

simon04

Message:

see ticket:9361#comment:13 - MapCSS validator: highlight both primitives for spatial tests - patch by akks

File:

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

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

@@ -8 +8 @@
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -361 +363 @@
          */
         TestError getErrorForPrimitive(OsmPrimitive p) {
-            return getErrorForPrimitive(p, whichSelectorMatchesPrimitive(p));
-        }
-
-        TestError getErrorForPrimitive(OsmPrimitive p, Selector matchingSelector) {
+            final Environment env = new Environment().withPrimitive(p);
+            return getErrorForPrimitive(p, whichSelectorMatchesEnvironment(env), env);
+        }
+
+        TestError getErrorForPrimitive(OsmPrimitive p, Selector matchingSelector, Environment env) {
             if (matchingSelector != null && !errors.isEmpty()) {
                 final Command fix = fixPrimitive(p);
                 final String description = getDescriptionForMatchingSelector(p, matchingSelector);
+                final List<OsmPrimitive> primitives;
+                if (env.child != null) {
+                    primitives = Arrays.asList(p, env.child);
+                } else {
+                    primitives = Collections.singletonList(p);
+                }
                 if (fix != null) {
-                    return new FixableTestError(null, getSeverity(), description, null, matchingSelector.toString(), 3000, p, fix);
+                    return new FixableTestError(null, getSeverity(), description, null, matchingSelector.toString(), 3000, primitives, fix);
                 } else {
-                    return new TestError(null, getSeverity(), description, null, matchingSelector.toString(), 3000, p);
+                    return new TestError(null, getSeverity(), description, null, matchingSelector.toString(), 3000, primitives);
                 }
             } else {
@@ -407 +416 @@
             if (selector != null) {
                 check.rule.execute(env);
-                final TestError error = check.getErrorForPrimitive(p, selector);
+                final TestError error = check.getErrorForPrimitive(p, selector, env);
                 if (error != null) {
                     error.setTester(new MapCSSTagCheckerAndRule(check.rule));