Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-02 21:07:34 +02:00
commit 68fda14c22

View file

@ -652,12 +652,14 @@ public class RouteResultPreparation {
// This was just to make sure that there's no bad data. // This was just to make sure that there's no bad data.
TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TL); TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TL);
TurnType.setSecondaryTurn(lanesArray, ind, tt); TurnType.setSecondaryTurn(lanesArray, ind, tt);
lanesArray[ind] |= 1;
} }
} else { } else {
if (!TurnType.isRightTurn(tt)) { if (!TurnType.isRightTurn(tt)) {
// This was just to make sure that there's no bad data. // This was just to make sure that there's no bad data.
TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TR); TurnType.setPrimaryTurnAndReset(lanesArray, ind, TurnType.TR);
TurnType.setSecondaryTurn(lanesArray, ind, tt); TurnType.setSecondaryTurn(lanesArray, ind, tt);
lanesArray[ind] |= 1;
} }
} }
setAllowedLanes(tt, lanesArray); setAllowedLanes(tt, lanesArray);