Changeset 16000 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

Timestamp:

2020-03-02T22:55:05+01:00 (4 years ago)

Author:

simon04

Message:

see #18802 - fix MapCSSRendererTest.testRender[relation-linkselector]

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -267 +267 @@
                 MapCSSRule r = rules.get(ruleIndex);
                 for (Selector selector : r.selectors) {
-                    final List<Condition> conditions = selector.getConditions();
+                    Selector selRightmost = selector;
+                    while (selRightmost instanceof Selector.ChildOrParentSelector) {
+                        selRightmost = ((Selector.ChildOrParentSelector) selRightmost).right;
+                    }
+                    final List<Condition> conditions = selRightmost.getConditions();
                     if (conditions == null || conditions.isEmpty()) {
                         remaining.set(ruleIndex);