Merge pull request #39 from ibi-group/car-and-vehicle-rental-back-mod…

…e-fix

Properly set the backMode after car and vehicle rentals are ended

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

@@ -76,6 +76,10 @@ public class StateData implements Cloneable {
 
     protected ServiceDay serviceDay;
 
+    /**
+     * The mode of transit to use when not traveling on transit. This should be updated each time transitions happen to
+     * other modes such as during parking a car at a park and ride or dropping off a bike rental.
+     */
     protected TraverseMode nonTransitMode;
 
     /**
@@ -93,7 +97,7 @@ public class StateData implements Cloneable {
     protected int lastNextArrivalDelta;
 
     /**
-     * The mode that was used to traverse the backEdge
+     * The mode that was used to traverse the state's backEdge
      */
     protected TraverseMode backMode;
 

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

@@ -593,6 +593,7 @@ public void boardHailedCar(double initialEdgeDistance) {
     public void endCarRenting() {
         cloneStateDataAsNeeded();
         child.stateData.usingRentedCar = false;
+        child.stateData.backMode = TraverseMode.WALK;
         child.stateData.nonTransitMode = TraverseMode.WALK;
     }
 
@@ -636,6 +637,7 @@ public void addRentedCar(String carId) {
     public void endVehicleRenting() {
         cloneStateDataAsNeeded();
         child.stateData.usingRentedVehicle = false;
+        child.stateData.backMode = TraverseMode.WALK;
         child.stateData.nonTransitMode = TraverseMode.WALK;
     }