Handle stepFree option consistently

... for ways in the base TranversalPermissionLabeler (by passing the TransportNetworkConfig files as an argument), and for nodes with kerb tags

Also, reduce duplicate code

Author: ansoncfit

src/main/java/com/conveyal/r5/analyst/cluster/TransportNetworkConfig.java

@@ -70,8 +70,9 @@ public class TransportNetworkConfig {
     public Double maxIncline;
 
     /**
-     * When used with certain TraversalPermissionLabelers (NoSteepInclinesTraversalPermissionLabeler for now), whether
-     * to exclude pedestrian traversal of ways with highway=stairs tags and nodes with kerb=raised tags
+     * Whether to exclude pedestrian traversal of ways with highway=stairs tags and nodes with kerb=raised tags. This
+     * option should generally be used with detailed sidewalk networks and a TraversalPermissionLabeler that forces
+     * use of sidewalks (i.e., disallows walking on roadways).
      */
     public boolean stepFree;
 

src/main/java/com/conveyal/r5/labeling/NoSidewalkCyclingTraversalPermissionLabeler.java

@@ -1,12 +1,17 @@
 package com.conveyal.r5.labeling;
 
 import com.conveyal.osmlib.Way;
+import com.conveyal.r5.analyst.cluster.TransportNetworkConfig;
 import com.conveyal.r5.streets.EdgeStore;
 
 /**
  * USTraversalPermissionLabeler, except biking is disallowed on ways with footway=sidewalk tag
  */
 public class NoSidewalkCyclingTraversalPermissionLabeler extends USTraversalPermissionLabeler {
+    public NoSidewalkCyclingTraversalPermissionLabeler (TransportNetworkConfig config) {
+        super(config);
+    }
+
     @Override
     public RoadPermission getPermissions(Way way) {
         RoadPermission rp = super.getPermissions(way);

src/main/java/com/conveyal/r5/labeling/NoSteepInclinesTraversalPermissionLabeler.java

@@ -8,40 +8,27 @@
  * USTraversalPermissionLabeler, except walking is disallowed on ways that allow cars and ways with inclines
  * steeper than a specified limit.
  */
-public class NoSteepInclinesTraversalPermissionLabeler extends USTraversalPermissionLabeler {
+public class NoSteepInclinesTraversalPermissionLabeler extends SidewalkTraversalPermissionLabeler {
 
     Double maxIncline;
-    boolean stepFree;
     public NoSteepInclinesTraversalPermissionLabeler (TransportNetworkConfig config) {
+        super(config);
         if (config != null) {
             if (config.maxIncline != null) this.maxIncline = config.maxIncline;
-            this.stepFree = config.stepFree;
         }
     }
     @Override
     public RoadPermission getPermissions(Way way) {
+        // Base class (SidewalkTraversalPermissionLabeler) disallows walking on ways that allow cars
         RoadPermission rp = super.getPermissions(way);
 
-        // Disallow walking on ways that allow cars
-        if (rp.forward.contains(EdgeStore.EdgeFlag.ALLOWS_CAR) ||
-                rp.forward.contains(EdgeStore.EdgeFlag.NO_THRU_TRAFFIC_CAR) ||
-                rp.backward.contains(EdgeStore.EdgeFlag.ALLOWS_CAR) ||
-                rp.backward.contains(EdgeStore.EdgeFlag.NO_THRU_TRAFFIC_CAR)
-        ) {
-            rp.disallowPedestrians();
-        }
-
         // Disallow walking on ways with slopes steeper than specified maxIncline
-        else if  (maxIncline != null) {
+        if  (maxIncline != null) {
             if (way.hasTag("incline") && Math.abs(Double.parseDouble(way.getTag("incline"))) > maxIncline) {
                 rp.disallowPedestrians();
             }
         }
 
-        if (stepFree && way.hasTag("highway", "steps")) {
-                rp.disallowPedestrians();
-        }
-
         return rp;
     }
 

src/main/java/com/conveyal/r5/labeling/SidewalkTraversalPermissionLabeler.java

@@ -1,6 +1,7 @@
 package com.conveyal.r5.labeling;
 
 import com.conveyal.osmlib.Way;
+import com.conveyal.r5.analyst.cluster.TransportNetworkConfig;
 import com.conveyal.r5.streets.EdgeStore;
 
 /**
@@ -16,6 +17,10 @@ public class SidewalkTraversalPermissionLabeler extends TraversalPermissionLabel
                 "access=yes");
     }
 
+    public SidewalkTraversalPermissionLabeler (TransportNetworkConfig config) {
+        super(config);
+    }
+
     @Override
     public RoadPermission getPermissions(Way way) {
         RoadPermission rp = super.getPermissions(way);
@@ -24,10 +29,7 @@ public RoadPermission getPermissions(Way way) {
             rp.backward.contains(EdgeStore.EdgeFlag.ALLOWS_CAR) ||
             rp.backward.contains(EdgeStore.EdgeFlag.NO_THRU_TRAFFIC_CAR)
         ) {
-            rp.forward.remove(EdgeStore.EdgeFlag.ALLOWS_PEDESTRIAN);
-            rp.forward.remove(EdgeStore.EdgeFlag.NO_THRU_TRAFFIC_PEDESTRIAN);
-            rp.backward.remove(EdgeStore.EdgeFlag.ALLOWS_PEDESTRIAN);
-            rp.backward.remove(EdgeStore.EdgeFlag.NO_THRU_TRAFFIC_PEDESTRIAN);
+            rp.disallowPedestrians();
         }
         return rp;
     }

src/main/java/com/conveyal/r5/labeling/TraversalPermissionLabeler.java

@@ -1,6 +1,7 @@
 package com.conveyal.r5.labeling;
 
 import com.conveyal.osmlib.Way;
+import com.conveyal.r5.analyst.cluster.TransportNetworkConfig;
 import com.conveyal.r5.streets.EdgeStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +30,8 @@ public abstract class TraversalPermissionLabeler {
     //This is immutable map of highway tag and boolean which is true if this tag has same road with _link
     static final Map<String, Boolean> validHighwayTags;
 
+    boolean stepFree;
+
     static {
 
         Map<String, Boolean> validHighwayTagsConst;
@@ -63,6 +66,12 @@ public abstract class TraversalPermissionLabeler {
         addPermissions("footway|steps|platform|public_transport=platform|railway=platform|corridor", "access=no;foot=yes");
     }
 
+    public TraversalPermissionLabeler (TransportNetworkConfig config) {
+        if (config != null) {
+            this.stepFree = config.stepFree;
+        }
+    }
+
     public RoadPermission getPermissions(Way way) {
         EnumMap<Node, Label> tree = getTreeForWay(way);
 
@@ -132,6 +141,10 @@ public RoadPermission getPermissions(Way way) {
             applyOppositeBicyclePermissions(way, backward);
         }
 
+        if (stepFree && way.hasTag("highway", "steps")) {
+            forward.remove(EdgeStore.EdgeFlag.ALLOWS_PEDESTRIAN);
+            backward.remove(EdgeStore.EdgeFlag.ALLOWS_PEDESTRIAN);
+        }
 
         return new RoadPermission(forward, backward);
     }

src/main/java/com/conveyal/r5/labeling/USTraversalPermissionLabeler.java

@@ -1,6 +1,8 @@
 package com.conveyal.r5.labeling;
 
 
+import com.conveyal.r5.analyst.cluster.TransportNetworkConfig;
+
 /**
  * Traversal permission labeler for the United States, adding things that differ from the base TraversalPermissionLabeler.
  * https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions#United_States_of_America
@@ -12,4 +14,8 @@ public class USTraversalPermissionLabeler extends TraversalPermissionLabeler {
         addPermissions("cycleway", "bicycle=yes;foot=yes");
     }
 
+    public USTraversalPermissionLabeler (TransportNetworkConfig config) {
+        super(config);
+    }
+
 }

src/main/java/com/conveyal/r5/streets/StreetLayer.java

@@ -212,17 +212,17 @@ public class StreetLayer implements Serializable, Cloneable {
 
     public StreetLayer() {
         speedLabeler = new SpeedLabeler(SpeedConfig.defaultConfig());
-        permissionLabeler = new USTraversalPermissionLabeler();
+        permissionLabeler = new USTraversalPermissionLabeler(null);
     }
 
     public StreetLayer(TransportNetworkConfig config) {
         this();
         if (config != null) {
             permissionLabeler = switch (config.traversalPermissionLabeler) {
-                case "sidewalk" -> new SidewalkTraversalPermissionLabeler();
-                case "noSidewalkCycling" -> new NoSidewalkCyclingTraversalPermissionLabeler();
+                case "sidewalk" -> new SidewalkTraversalPermissionLabeler(config);
+                case "noSidewalkCycling" -> new NoSidewalkCyclingTraversalPermissionLabeler(config);
                 case "noSteepWays" -> new NoSteepInclinesTraversalPermissionLabeler(config);
-                case null -> new USTraversalPermissionLabeler();
+                case null -> new USTraversalPermissionLabeler(config);
                 default -> throw new IllegalArgumentException(
                         "Unknown traversal permission labeler: " + config.traversalPermissionLabeler
                 );
@@ -231,7 +231,7 @@ public StreetLayer(TransportNetworkConfig config) {
             stepFree = config.stepFree;
 
         } else {
-            permissionLabeler = new USTraversalPermissionLabeler();
+            permissionLabeler = new USTraversalPermissionLabeler(null);
         }
     }