Merge pull request opentripplanner#7598 from HSLdevcom/remove-finland-double-walk-penalty

(Finland) Avoid applying x5 penalty for walking twice, once from foot=use_sidepath and once from bicycle=use_sidepath

Author: tkalvas

application/src/main/java/org/opentripplanner/osm/tagmapping/FinlandMapper.java

@@ -12,6 +12,9 @@
 import org.opentripplanner.framework.functional.FunctionUtils.TriFunction;
 import org.opentripplanner.osm.model.OsmEntity;
 import org.opentripplanner.osm.wayproperty.WayPropertySet;
+import org.opentripplanner.osm.wayproperty.specifier.Condition.Equals;
+import org.opentripplanner.osm.wayproperty.specifier.Condition.Not;
+import org.opentripplanner.osm.wayproperty.specifier.ExactMatchSpecifier;
 import org.opentripplanner.street.model.StreetTraversalPermission;
 
 /**
@@ -182,7 +185,13 @@ else if (speedLimit <= 16.65f) {
 
     // Typically if this tag is used on a way, there is also a better option for walking.
     // We don't need to set bicycle safety as cycling is not currently allowed on these ways.
-    props.setMixinProperties("bicycle=use_sidepath", ofWalkSafety(5));
+    props.setMixinProperties(
+      new ExactMatchSpecifier(
+        new Not(new Equals("foot", "use_sidepath")),
+        new Equals("bicycle", "use_sidepath")
+      ),
+      ofWalkSafety(5)
+    );
 
     // Automobile speeds in Finland.
     // General speed limit is 80kph unless signs says otherwise.

application/src/test/java/org/opentripplanner/osm/tagmapping/FinlandMapperTest.java

@@ -174,6 +174,11 @@ void testUseSidePath() {
     assertEquals(9, wps.getDataForWay(wayWithBicycleSidePath).forward().walkSafety(), EPSILON);
     var wayWithFootSidePath = OsmWay.of().withTag("foot", "use_sidepath").build();
     assertEquals(9, wps.getDataForWay(wayWithFootSidePath).forward().walkSafety(), EPSILON);
+    var wayWithBoth = OsmWay.of()
+      .withTag("foot", "use_sidepath")
+      .withTag("bicycle", "use_sidepath")
+      .build();
+    assertEquals(9, wps.getDataForWay(wayWithBoth).forward().walkSafety(), EPSILON);
   }
 
   @Test

doc/user/osm/Finland.md

@@ -127,7 +127,7 @@ Multiple mixins can apply to the same way and their effects compound.
 
 | matcher                                                                                                                                                                      | add permission    | remove permission      | bicycle safety                                      | walk safety |
 |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------|------------------------|-----------------------------------------------------|-------------|
-| `bicycle=use_sidepath`                                                                                                                                                       |                   |                        |                                                     | 5.0         |
+| `not(foot=use_sidepath); bicycle=use_sidepath`                                                                                                                               |                   |                        |                                                     | 5.0         |
 | `motorroad=yes`                                                                                                                                                              |                   | PEDESTRIAN_AND_BICYCLE |                                                     |             |
 | `cycleway=lane; not(highway=cycleway)`                                                                                                                                       | BICYCLE           |                        | 0.87                                                |             |
 | `cycleway=share_busway; not(highway=cycleway)`                                                                                                                               | BICYCLE           |                        | 0.92                                                |             |