Changeset 8266 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-04-25T19:13:12+02:00 (9 years ago)

Author:

simon04

Message:

fix #9782 fix #10859 - MapCSS validator: evaluate real key and value for KeyConditions

File:

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

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

@@ -4 +4 @@
 import java.text.MessageFormat;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Objects;
@@ -340 +341 @@
         }
 
-        public Tag asTag() {
-            return new Tag(label);
+        public Tag asTag(OsmPrimitive p) {
+            String key = label;
+            if (KeyMatchType.REGEX.equals(matchType)) {
+                final Collection<String> matchingKeys = Utils.filter(p.keySet(), containsPattern);
+                if (!matchingKeys.isEmpty()) {
+                    key = matchingKeys.iterator().next();
+                }
+            }
+            return new Tag(key, p.get(key));
         }