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

Timestamp:

2011-05-02T23:47:19+02:00 (13 years ago)

Author:

bastiK

Message:

mapcss: add role based selection (collaborative work by Gubaer and me)

File:

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

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

@@ -174 +174 @@
 
             public String parent_tag(String key) {
-                if (env.getMatchingReferrers() == null) {
+                if (env.parent == null) {
                     // we don't have a matched parent, so just search all referrers
                     for (OsmPrimitive parent : env.osm.getReferrers()) {
@@ -183 +183 @@
                     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);
+                return env.parent.get(key);
             }
 
             public boolean has_tag_key(String key) {
                 return env.osm.hasKey(key);
+            }
+
+            public Float index() {
+                if (env.index == null)
+                    return null;
+                return new Float(env.index + 1);
+            }
+
+            public String role() {
+                return env.getRole();
             }