Changeset 8260 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2015-04-25T14:00:05+02:00 (9 years ago)

Author:

bastiK

Message:

see #10217 - move unit handling to parser
adds support for negative angles
new: length units px,cm,mm,in,q,pc,pt as in CSS (immediately converted to px)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory;
+import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory.NullExpression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
 import org.openstreetmap.josm.gui.mappaint.mapcss.LiteralExpression;
@@ -184 +185 @@
 |   < CARET: "^" >
 |   < FULLSTOP: "." >
+|   < DEG: "°" >
 |   < ELEMENT_OF: "∈" >
 |   < CROSSING: "⧉" >
@@ -1028 +1030 @@
         fn=function() { return fn; }
     |
-        lit=literal() { return new LiteralExpression(lit); }
+        lit=literal()
+        { 
+            if (lit == null)
+                return NullExpression.INSTANCE;
+            return new LiteralExpression(lit);
+        }
     |
         <LPAR> w() nested=expression() <RPAR> { return nested; }
@@ -1054 +1061 @@
     String val, pref;
     Token t;
-    float f;
+    Float f;
 }
 {
@@ -1067 +1074 @@
         <PLUS> f=ufloat() { return new Instruction.RelativeFloat(f); }
     |
+        LOOKAHEAD(2)
+        f=ufloat_unit() { return f; }
+    |
         f=ufloat() { return f; }
     |
         t=<HEXCOLOR> { return ColorHelper.html2color(t.image); }
+}
+
+/**
+ * Number followed by a unit.
+ *
+ * Returns angles in radians and lengths in pixels.
+ */
+Float ufloat_unit() :
+{
+    float f;
+    String u;
+}
+{
+    f=ufloat() ( u=ident() | <DEG> { u = "°"; } )
+    {
+        Double m = unit_factor(u);
+        if (m == null)
+            return null;
+        return (float) (f * m);
+    }
+}
+
+JAVACODE
+private Double unit_factor(String unit) {
+    switch (unit) {
+        case "deg":
+        case "°": return Math.PI / 180;
+        case "rad": return 1.;
+        case "grad": return Math.PI / 200;
+        case "turn": return 2 * Math.PI;
+        case "px": return 1.;
+        case "cm": return 96/2.54;
+        case "mm": return 9.6/2.54;
+        case "in": return 96.;
+        case "q": return 2.4/2.54;
+        case "pc": return 16.;
+        case "pt": return 96./72;
+        default: return null;
+    }
 }