Changeset 11670 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

Timestamp:

2017-03-04T22:29:24+01:00 (7 years ago)

Author:

michael2402

Message:

See #10176: Make icon-image work for areas. Icon is displayed at center of lat/lon bounds.

File:

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

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -70 +70 @@
         Cascade c = env.mc.getCascade(env.layer);
 
-        MapImage mapImage = createIcon(env, ICON_KEYS);
+        MapImage mapImage = createIcon(env);
         Symbol symbol = null;
         if (mapImage == null) {
             symbol = createSymbol(env);
         }
+
+        RotationAngle rotationAngle = createRotationAngle(env);
+
+        // optimization: if we neither have a symbol, nor a mapImage
+        // we don't have to check for the remaining style properties and we don't
+        // have to allocate a node element style.
+        if (!allowDefault && symbol == null && mapImage == null) return null;
+
+        return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
+    }
+
+    /**
+     * Reads the icon-rotation property and creates a rotation angle from it.
+     * @param env The environment
+     * @return The angle
+     */
+    public static RotationAngle createRotationAngle(Environment env) {
+        Cascade c = env.mc.getCascade(env.layer);
+
         RotationAngle rotationAngle = null;
         final Float angle = c.get(ICON_ROTATION, null, Float.class, true);
@@ -93 +112 @@
             }
         }
-
-        // optimization: if we neither have a symbol, nor a mapImage
-        // we don't have to check for the remaining style properties and we don't
-        // have to allocate a node element style.
-        if (!allowDefault && symbol == null && mapImage == null) return null;
-
-        return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
+        return rotationAngle;
+    }
+
+    public static MapImage createIcon(final Environment env) {
+        return createIcon(env, ICON_KEYS);
     }