Add stepFree as network config option

and reduce duplicate code

Author: ansoncfit

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

@@ -69,4 +69,10 @@ 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
+     */
+    public boolean stepFree;
+
 }

src/main/java/com/conveyal/r5/labeling/NoSteepInclinesTraversalPermissionLabeler.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;
 
 /**
@@ -10,8 +11,10 @@
 public class NoSteepInclinesTraversalPermissionLabeler extends USTraversalPermissionLabeler {
 
     Double maxIncline;
-    public NoSteepInclinesTraversalPermissionLabeler (Double maxIncline) {
-        if (maxIncline != null) this.maxIncline = maxIncline;
+    boolean stepFree;
+    public NoSteepInclinesTraversalPermissionLabeler (TransportNetworkConfig config) {
+        if (config.maxIncline != null) this.maxIncline = config.maxIncline;
+        this.stepFree = config.stepFree;
     }
     @Override
     public RoadPermission getPermissions(Way way) {
@@ -33,6 +36,10 @@ else if  (maxIncline != null) {
             }
         }
 
+        if (stepFree && way.hasTag("highway", "steps")) {
+                rp.disallowPedestrians();
+        }
+
         return rp;
     }
 

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

@@ -17,7 +17,6 @@
 import com.conveyal.r5.labeling.RoadPermission;
 import com.conveyal.r5.labeling.SidewalkTraversalPermissionLabeler;
 import com.conveyal.r5.labeling.SpeedLabeler;
-import com.conveyal.r5.labeling.StepFreeTraversalPermissionLabeler;
 import com.conveyal.r5.labeling.StreetClass;
 import com.conveyal.r5.labeling.TraversalPermissionLabeler;
 import com.conveyal.r5.labeling.TypeOfEdgeLabeler;
@@ -222,8 +221,7 @@ public StreetLayer(TransportNetworkConfig config) {
             permissionLabeler = switch (config.traversalPermissionLabeler) {
                 case "sidewalk" -> new SidewalkTraversalPermissionLabeler();
                 case "noSidewalkCycling" -> new NoSidewalkCyclingTraversalPermissionLabeler();
-                case "noSteepWays" -> new NoSteepInclinesTraversalPermissionLabeler(config.maxIncline);
-                case "stepFree" -> new StepFreeTraversalPermissionLabeler(config.maxIncline);
+                case "noSteepWays" -> new NoSteepInclinesTraversalPermissionLabeler(config);
                 case null -> new USTraversalPermissionLabeler();
                 default -> throw new IllegalArgumentException(
                         "Unknown traversal permission labeler: " + config.traversalPermissionLabeler
@@ -233,9 +231,8 @@ public StreetLayer(TransportNetworkConfig config) {
             permissionLabeler = new USTraversalPermissionLabeler();
         }
 
-        if (permissionLabeler instanceof StepFreeTraversalPermissionLabeler) {
-            stepFree = ((StepFreeTraversalPermissionLabeler) permissionLabeler).requireStepFree;
-        }
+        stepFree = config.stepFree;
+
     }
 
     /** Load street layer from an OSM-lib OSM DB */