Changeset 8260 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

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/NodeElemStyle.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -120 +120 @@
             symbol = createSymbol(env);
         }
-        final String rotationString = c.get("icon-rotation", null, String.class);
         RotationAngle rotationAngle = null;
-        if ("way".equalsIgnoreCase(rotationString)) {
-            rotationAngle = RotationAngle.buildWayDirectionRotation();
-        } else if (rotationString != null) {
-            try {
-                rotationAngle = RotationAngle.buildStaticRotation(rotationString);
-            } catch (RuntimeException ignore) {
+        final Float angle = c.get(ICON_ROTATION, null, Float.class, true);
+        if (angle != null) {
+            rotationAngle = RotationAngle.buildStaticRotation(angle);
+        } else {
+            final Keyword rotationKW = c.get(ICON_ROTATION, null, Keyword.class);
+            if (rotationKW != null) {
+                if ("way".equals(rotationKW.val)) {
+                    rotationAngle = RotationAngle.buildWayDirectionRotation();
+                } else {
+                    try {
+                        rotationAngle = RotationAngle.buildStaticRotation(rotationKW.val);
+                    } catch (IllegalArgumentException ignore) {
+                    }
+                }
             }
         }