Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
60eac58659
1 changed files with 4 additions and 4 deletions
|
@ -600,11 +600,11 @@ public class RouteResultPreparation {
|
||||||
// mpi = MapUtils.degreesDiff(prev.getBearingEnd(), begin);
|
// mpi = MapUtils.degreesDiff(prev.getBearingEnd(), begin);
|
||||||
}
|
}
|
||||||
if (mpi >= TURN_DEGREE_MIN) {
|
if (mpi >= TURN_DEGREE_MIN) {
|
||||||
if (mpi < 60) {
|
if (mpi < 45) {
|
||||||
t = TurnType.valueOf(TurnType.TSLL, leftSide);
|
t = TurnType.valueOf(TurnType.TSLL, leftSide);
|
||||||
} else if (mpi < 120) {
|
} else if (mpi < 120) {
|
||||||
t = TurnType.valueOf(TurnType.TL, leftSide);
|
t = TurnType.valueOf(TurnType.TL, leftSide);
|
||||||
} else if (mpi < 135 || leftSide) {
|
} else if (mpi < 150 || leftSide) {
|
||||||
t = TurnType.valueOf(TurnType.TSHL, leftSide);
|
t = TurnType.valueOf(TurnType.TSHL, leftSide);
|
||||||
} else {
|
} else {
|
||||||
t = TurnType.valueOf(TurnType.TU, leftSide);
|
t = TurnType.valueOf(TurnType.TU, leftSide);
|
||||||
|
@ -612,11 +612,11 @@ public class RouteResultPreparation {
|
||||||
int[] lanes = getTurnLanesInfo(prev, t.getValue());
|
int[] lanes = getTurnLanesInfo(prev, t.getValue());
|
||||||
t.setLanes(lanes);
|
t.setLanes(lanes);
|
||||||
} else if (mpi < -TURN_DEGREE_MIN) {
|
} else if (mpi < -TURN_DEGREE_MIN) {
|
||||||
if (mpi > -60) {
|
if (mpi > -45) {
|
||||||
t = TurnType.valueOf(TurnType.TSLR, leftSide);
|
t = TurnType.valueOf(TurnType.TSLR, leftSide);
|
||||||
} else if (mpi > -120) {
|
} else if (mpi > -120) {
|
||||||
t = TurnType.valueOf(TurnType.TR, leftSide);
|
t = TurnType.valueOf(TurnType.TR, leftSide);
|
||||||
} else if (mpi > -135 || !leftSide) {
|
} else if (mpi > -150 || !leftSide) {
|
||||||
t = TurnType.valueOf(TurnType.TSHR, leftSide);
|
t = TurnType.valueOf(TurnType.TSHR, leftSide);
|
||||||
} else {
|
} else {
|
||||||
t = TurnType.valueOf(TurnType.TRU, leftSide);
|
t = TurnType.valueOf(TurnType.TRU, leftSide);
|
||||||
|
|
Loading…
Reference in a new issue