Changeset 4011 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

Timestamp:

2011-03-30T22:25:20+02:00 (15 years ago)

Author:

bastiK

Message:

applied #6150 - mapcss - improve parent_tag (based on patch by Gubaer)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java (modified) (2 diffs)

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

@@ -17 +17 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -174 +173 @@
             }
 
-            // FIXME: respect parent selector chain
             public String parent_tag(String key) {
-                for (Relation parent: OsmPrimitive.getFilteredList(env.osm.getReferrers(), Relation.class)) {
-                    String value = parent.get(key);
-                    if (value != null) return value;
-                }
-                return null;
+                if (env.getMatchingReferrers() == null) {
+                    // we don't have a matched parent, so just search all referrers
+                    for (OsmPrimitive parent : env.osm.getReferrers()) {
+                        String value = parent.get(key);
+                        if (value != null)
+                            return value;
+                    }
+                    return null;
+                }
+                if (env.getMatchingReferrers().isEmpty())
+                    return null;
+                // use always the first matching referrer to have consistency
+                // in an expression and declaration block
+                return env.getMatchingReferrers().iterator().next().get(key);
             }