Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
68fda14c22
1 changed files with 2 additions and 0 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue