Parameter simplification: allow maxWalkDistance = 0 to be specified and get rid of redundant excludeWalking parameter

Author: sdjacobs

src/main/java/org/opentripplanner/api/common/RoutingResource.java

@@ -461,9 +461,6 @@ protected RoutingRequest buildRequest() throws ParameterException {
         if (maxWalkDistance != null) {
             request.setMaxWalkDistance(maxWalkDistance);
             request.maxTransferWalkDistance = maxWalkDistance;
-            if (maxWalkDistance == 0.0) {
-                request.excludeWalking = true;
-            }
         }
 
         if (maxPreTransitTime != null)

src/main/java/org/opentripplanner/routing/core/RoutingRequest.java

@@ -574,14 +574,6 @@ public class RoutingRequest implements Cloneable, Serializable {
      */
     public boolean enterStationsWithCar = false;
 
-    /**
-     * Totally exclude walking from trip plan results. This should likely be false for the
-     * majority of applications; however, when GTFS-Flex is enabled, customers may wish to avoid
-     * walking at all costs (perhaps due to age or disability), which can be accomodated via call-
-     * and-ride service.
-     */
-    public boolean excludeWalking = false;
-
     /**
      * Minimum length in meters of partial hop edges. This parameter only applies to GTFS-Flex
      * routing, which must be explicitly turned on via the useFlexService parameter in router-
@@ -1172,7 +1164,6 @@ public boolean equals(Object o) {
                 && flexUseReservationServices == other.flexUseReservationServices
                 && flexUseEligibilityServices == other.flexUseEligibilityServices
                 && flexIgnoreDrtAdvanceBookMin == other.flexIgnoreDrtAdvanceBookMin
-                && excludeWalking == other.excludeWalking
                 && flexMinPartialHopLength == other.flexMinPartialHopLength
                 && clockTimeSec == other.clockTimeSec;
     }
@@ -1215,7 +1206,6 @@ public int hashCode() {
                 + Boolean.hashCode(flexUseReservationServices) * 92429033
                 + Boolean.hashCode(flexUseEligibilityServices) * 7916959
                 + Boolean.hashCode(flexIgnoreDrtAdvanceBookMin) * 179992387
-                + Boolean.hashCode(excludeWalking) * 989684221
                 + Integer.hashCode(flexMinPartialHopLength) * 15485863
                 + Long.hashCode(clockTimeSec) * 833389
                 + new Boolean(disableRemainingWeightHeuristic).hashCode() * 193939;
@@ -1323,7 +1313,7 @@ private String getRouteOrAgencyStr(HashSet<String> strings) {
     }
 
     public void setMaxWalkDistance(double maxWalkDistance) {
-        if (maxWalkDistance > 0) {
+        if (maxWalkDistance >= 0) {
             this.maxWalkDistance = maxWalkDistance;
             bikeWalkingOptions.maxWalkDistance = maxWalkDistance;
         }

src/main/java/org/opentripplanner/routing/edgetype/StreetEdge.java

@@ -243,9 +243,6 @@ public double getDistance() {
     public State traverse(State s0) {
         final RoutingRequest options = s0.getOptions();
         final TraverseMode currMode = s0.getNonTransitMode();
-        if (options.excludeWalking && currMode.equals(TraverseMode.WALK)) {
-            return null;
-        }
         StateEditor editor = doTraverse(s0, options, s0.getNonTransitMode());
         State state = (editor == null) ? null : editor.makeState();
         /* Kiss and ride support. Mode transitions occur without the explicit loop edges used in park-and-ride. */

src/main/java/org/opentripplanner/routing/flex/GtfsFlexGraphModifier.java

@@ -149,7 +149,6 @@ public void vertexVisitor(State state) {}
      */
     public void createForwardHops(RoutingRequest request) {
         RoutingRequest forward = request.clone();
-        forward.excludeWalking = false;
         forward.setMode(getMode());
         forward.setArriveBy(false);
         // allow discovery of stations even with car mode
@@ -164,7 +163,6 @@ public void createForwardHops(RoutingRequest request) {
      */
     public void createBackwardHops(RoutingRequest request) {
         RoutingRequest backward = request.clone();
-        backward.excludeWalking = false;
         backward.setMode(getMode());
         backward.setArriveBy(true);
         backward.enterStationsWithCar = true;