Changeset 8199 in josm for trunk

Timestamp:

2015-04-15T23:51:33+02:00 (10 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

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/util/RotationAngle.java (added)
• test/unit/org/openstreetmap/josm/gui/util (added)
• test/unit/org/openstreetmap/josm/gui/util/RotationAngleTest.java (added)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -734 +734 @@
     }
 
-    public void drawNodeIcon(Node n, MapImage img, boolean disabled, boolean selected, boolean member) {
+    public void drawNodeIcon(Node n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) {
         Point p = nc.getPoint(n);
 
@@ -747 +747 @@
             g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
         }
+        g.rotate(theta, p.x, p.y);
         g.drawImage(img.getImage(disabled), p.x - w/2 + img.offsetX, p.y - h/2 + img.offsetY, nc);
+        g.rotate(-theta, p.x, p.y);
         g.setPaintMode();
         if (selected || member)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.util.RotationAngle;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -26 +27 @@
 public class NodeElemStyle extends ElemStyle implements StyleKeys {
     public final MapImage mapImage;
+    public final RotationAngle mapImageAngle;
     public final Symbol symbol;
 
@@ -99 +101 @@
     public static final StyleList DEFAULT_NODE_STYLELIST_TEXT = new StyleList(NodeElemStyle.SIMPLE_NODE_ELEMSTYLE, BoxTextElemStyle.SIMPLE_NODE_TEXT_ELEMSTYLE);
 
-    protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index) {
+    protected NodeElemStyle(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index, RotationAngle rotationAngle) {
         super(c, default_major_z_index);
         this.mapImage = mapImage;
         this.symbol = symbol;
+        this.mapImageAngle = rotationAngle;
     }
 
@@ -117 +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) {
+            }
+        }
 
         // optimization: if we neither have a symbol, nor a mapImage
@@ -123 +136 @@
         if (!allowDefault && symbol == null && mapImage == null) return null;
 
-        return new NodeElemStyle(c, mapImage, symbol, default_major_z_index);
+        return new NodeElemStyle(c, mapImage, symbol, default_major_z_index, rotationAngle);
     }
 
@@ -257 +270 @@
             Node n = (Node) primitive;
             if (mapImage != null && painter.isShowIcons()) {
-                painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member);
+                painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member,
+                        mapImageAngle == null ? 0.0 : mapImageAngle.getRotationAngle(primitive));
             } else if (symbol != null) {
                 Color fillColor = symbol.fillColor;

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