Fix dominance for multi-non-transit-mode routing #865 #1042.

opentripplanner · Apr 11, 2013 · aa5fc03 · aa5fc03
1 parent 26ab2b1
commit aa5fc03
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/opentripplanner-routing/src/main/java/org/opentripplanner/routing/core/State.java b/opentripplanner-routing/src/main/java/org/opentripplanner/routing/core/State.java
@@ -273,8 +273,12 @@ public boolean dominates(State other) {
             return false;
         }
         // Multi-state (bike rental) - no domination for different states
+        // TODO: I think this isn't necessary now that we have the check below
         if (isBikeRenting() != other.isBikeRenting())
             return false;
+
+        if (!stateData.nonTransitMode.equals(other.stateData.nonTransitMode))
+            return false;
 
         if (backEdge != other.getBackEdge() && ((backEdge instanceof PlainStreetEdge)
                 && (!((PlainStreetEdge) backEdge).getTurnRestrictions().isEmpty())))