Changeset 18664 in josm for trunk/src

Timestamp:

2023-02-15T18:22:07+01:00 (14 months ago)

Author:

taylor.smock

Message:

Fix #22704: Add parent_way_angle mapcss function (patch by Woazboat)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• ExpressionFactory.java (modified) (1 diff)
• Functions.java (modified) (2 diffs)

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

@@ -217 +217 @@
         FACTORY_MAP.put("parent_tag", Factory.ofEnv(String.class, Functions::parent_tag));
         FACTORY_MAP.put("parent_tags", Factory.ofEnv(String.class, Functions::parent_tags));
+        FACTORY_MAP.put("parent_way_angle", Factory.ofEnv(Functions::parent_way_angle));
         FACTORY_MAP.put("plus", Factory.ofNumberVarArgs(0.0, DoubleUnaryOperator.identity(), Functions::plus));
         FACTORY_MAP.put("print", Factory.of(Object.class, Functions::print));

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

@@ -42 +42 @@
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.RotationAngle.WayDirectionRotationAngle;
 
 /**
@@ -479 +480 @@
 
     /**
+     * Get the rotation angle of the preceding parent way segment at the node location.
+     * If there is no preceding parent way segment, the following way segment is used instead.
+     * Requires a parent way object matched via
+     * <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#LinkSelector">child selector</a>.
+     * 
+     * @param env the environment
+     * @return the rotation angle of the parent way segment at the node in radians,
+     * otherwise null if there is no matching parent way or the object is not a node
+     * @since 18664
+     */
+    public static Double parent_way_angle(final Environment env) {
+        if (env.osm instanceof Node && env.parent instanceof Way) {
+            return WayDirectionRotationAngle.getRotationAngleForNodeOnWay((Node) env.osm, (Way) env.parent);
+        }
+        return null;
+    }
+
+    /**
      * Gets the value of the key {@code key} from the object's child.
      * @param env the environment