Changeset 8199 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

Timestamp:

2015-04-15T23:51:33+02:00 (11 years ago)

Author:

simon04

Message:

see #10217 - Enable rotating icons with MapCSS

The corresponding key is icon-rotation and takes angles in the following forms:
[rad], [rad]rad, [deg]°, [deg]deg, or a cardinal direction
(e.g., northeast, sw).

In addition, the following MapCSS functions are provided:
degree_to_radians, cardinal_to_radians

File:

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

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

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.util.RotationAngle;
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -547 +548 @@
 
         /**
+         * Converts an angle in degrees to radians.
+         * @param degree the angle in degrees
+         * @return the angle in radians
+         * @see Math#toRadians(double)
+         */
+        public static double degree_to_radians(double degree) {
+            return Math.toRadians(degree);
+        }
+
+        /**
+         * Converts an angle diven in cardinal directions to radians.
+         * The following values are supported: {@code n}, {@code north}, {@code ne}, {@code northeast},
+         * {@code e}, {@code east}, {@code se}, {@code southeast}, {@code s}, {@code south},
+         * {@code sw}, {@code southwest}, {@code w}, {@code west}, {@code nw}, {@code northwest}.
+         * @param cardinal the angle in cardinal directions.
+         * @see RotationAngle#parseCardinalRotation(String)
+         * @return the angle in radians
+         */
+        public static Double cardinal_to_radians(String cardinal) {
+            try {
+                return RotationAngle.parseCardinalRotation(cardinal);
+            } catch (IllegalArgumentException ignore) {
+                return null;
+            }
+        }
+
+        /**
          * Determines if the objects {@code a} and {@code b} are equal.
          * @param a First object