Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-10-15 14:42:55 +02:00
commit b51648b92c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -439,7 +439,7 @@ public class RouteResultPreparation {
} else {
t = TurnType.valueOf(TurnType.TU, leftSide);
}
getLanesInfo(prev, t, leftSide);
assignLanesInfo(prev, t, leftSide);
} else if (mpi < -TURN_DEGREE_MIN) {
if (mpi > -60) {
t = TurnType.valueOf(TurnType.TSLR, leftSide);
@ -450,7 +450,7 @@ public class RouteResultPreparation {
} else {
t = TurnType.valueOf(TurnType.TU, leftSide);
}
getLanesInfo(prev, t, leftSide);
assignLanesInfo(prev, t, leftSide);
} else {
t = attachKeepLeftInfoAndLanes(leftSide, prev, rr, t);
}
@ -461,7 +461,7 @@ public class RouteResultPreparation {
return t;
}
private void getLanesInfo(RouteSegmentResult prevSegm, TurnType t, boolean leftSide) {
private void assignLanesInfo(RouteSegmentResult prevSegm, TurnType t, boolean leftSide) {
int lanes = prevSegm.getObject().getLanes();
if (prevSegm.getObject().getOneway() == 0) {
lanes = countLanes(prevSegm, lanes);