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

Timestamp:

2015-02-19T15:22:49+01:00 (9 years ago)

Author:

bastiK

Message:

MapCSS: new @supports rule

Implementation should be mostly compatible with
the CSS Conditional 3 draft [2].

This is similar to @media, which was previously misused
for this purpose and is now deprecated.

refs:
[1] ​https://wiki.openstreetmap.org/wiki/MapCSS/0.2/Proposal_media_query
[2] ​http://dev.w3.org/csswg/css-conditional/

File:

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

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.LineElemStyle;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.Range;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.StyleSetting;
 import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
@@ -81 +84 @@
      */
     public final static ReadWriteLock STYLE_SOURCE_LOCK = new ReentrantReadWriteLock();
+
+    /**
+     * Set of all supported MapCSS keys.
+     */
+    public static final Set<String> SUPPORTED_KEYS = new HashSet<>();
+    static {
+        Field[] declaredFields = StyleKeys.class.getDeclaredFields();
+        for (Field f : declaredFields) {
+            try {
+                SUPPORTED_KEYS.add((String) f.get(null));
+                if (!f.getName().toLowerCase().replace("_", "-").equals(f.get(null))) {
+                    throw new RuntimeException(f.getName());
+                }
+            } catch (IllegalArgumentException | IllegalAccessException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+        for (LineElemStyle.LineType lt : LineElemStyle.LineType.values()) {
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.COLOR);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.DASHES);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.DASHES_BACKGROUND_COLOR);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.DASHES_BACKGROUND_OPACITY);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.DASHES_OFFSET);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.LINECAP);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.LINEJOIN);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.MITERLIMIT);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.OFFSET);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.OPACITY);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.REAL_WIDTH);
+            SUPPORTED_KEYS.add(lt.prefix + StyleKeys.WIDTH);
+        }
+    }
 
     /**
@@ -484 +519 @@
     }
 
-    public boolean evalMediaExpression(String feature, Object val) {
+    public boolean evalSupportsDeclCondition(String feature, Object val) {
         if (feature == null) return false;
+        if (SUPPORTED_KEYS.contains(feature)) return true;
         switch (feature) {
             case "user-agent":