Merge remote-tracking branch 'origin/fix-constanspeed-shortcuts' into…

… dev-2.x
HSLdevcom · Nov 14, 2024 · ded233d · ded233d
2 parents 7a754ec + 88eaafb
commit ded233d
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 201 deletions.
diff --git a/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
@@ -106,9 +106,9 @@ static StyleSpec build(
       ListUtils.combine(
         List.of(StyleBuilder.ofId("background").typeRaster().source(BACKGROUND_SOURCE).minZoom(0)),
         wheelchair(edges),
-        edges(edges),
-        traversalPermissions(edges),
         noThruTraffic(edges),
+        traversalPermissions(edges),
+        edges(edges),
         vertices(vertices),
         stops(regularStops, areaStops, groupStops)
       )

diff --git a/application/src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java b/application/src/main/java/org/opentripplanner/osm/tagmapping/ConstantSpeedMapper.java
@@ -1,5 +1,6 @@
 package org.opentripplanner.osm.tagmapping;
 
+import java.util.Set;
 import org.opentripplanner.osm.model.OsmWithTags;
 import org.opentripplanner.osm.wayproperty.WayPropertySet;
 
@@ -8,6 +9,14 @@
  */
 class ConstantSpeedFinlandMapper extends FinlandMapper {
 
+  private static final Set<String> NOTHROUGH_DRIVING_TAGS = Set.of(
+    "parking_aisle",
+    "driveway",
+    "alley",
+    "emergency_access",
+    "drive-through"
+  );
+
   private float speed;
 
   public ConstantSpeedFinlandMapper() {
@@ -42,4 +51,16 @@ public Float getMaxUsedCarSpeed(WayPropertySet wayPropertySet) {
     // than what is used for the street edge car speeds.
     return speed;
   }
+
+  @Override
+  public boolean isMotorVehicleThroughTrafficExplicitlyDisallowed(OsmWithTags way) {
+    if (super.isMotorVehicleThroughTrafficExplicitlyDisallowed(way)) {
+      return true;
+    }
+    /*
+     * Constant speed routing tends to use unrecommended shortcuts
+     * through parking areas etc. Prevent this.
+     */
+    return way.isOneOfTags("service", NOTHROUGH_DRIVING_TAGS);
+  }
 }