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 2016-05-06 11:31:52 +02:00
commit e01c142ed2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/views/TurnPathHelper.java
View file

@ -321,7 +321,7 @@ public class TurnPathHelper {
} }
} }
private static TurnResource getTallArrow(int tt){ private static TurnResource getTallArrow(int tt, boolean nooverlap){
TurnResource result = new TurnResource(); TurnResource result = new TurnResource();
@ -331,7 +331,7 @@ public class TurnPathHelper {
break; break;
case TurnType.TR: case TurnType.TR:
case TurnType.TL: case TurnType.TL:
result.resourceId = R.drawable.map_turn_right2_small; result.resourceId = nooverlap ? R.drawable.map_turn_right_small : R.drawable.map_turn_right2_small;
break; break;
case TurnType.KR: case TurnType.KR:
case TurnType.KL: case TurnType.KL:
@ -416,14 +416,14 @@ public class TurnPathHelper {
if (turnIndex == FIRST_TURN) { if (turnIndex == FIRST_TURN) {
if (secondTurnType == 0) { if (secondTurnType == 0) {
turnResource = getTallArrow(firstTurnType); turnResource = getTallArrow(firstTurnType, true);
} else if (secondTurnType == TurnType.C || thirdTurnType == TurnType.C) { } else if (secondTurnType == TurnType.C || thirdTurnType == TurnType.C) {
turnResource = getShortArrow(firstTurnType); turnResource = getShortArrow(firstTurnType);
} else { } else {
if (firstTurnType == TurnType.TU || firstTurnType == TurnType.TRU) { if (firstTurnType == TurnType.TU || firstTurnType == TurnType.TRU) {
turnResource = getShortArrow(firstTurnType); turnResource = getShortArrow(firstTurnType);
} else { } else {
turnResource = getTallArrow(firstTurnType); turnResource = getTallArrow(firstTurnType, false);
} }
} }
} else if (turnIndex == SECOND_TURN) { } else if (turnIndex == SECOND_TURN) {
@ -435,7 +435,7 @@ public class TurnPathHelper {
// get the small one // get the small one
turnResource = getShortArrow(secondTurnType); turnResource = getShortArrow(secondTurnType);
} else { } else {
turnResource = getTallArrow(secondTurnType); turnResource = getTallArrow(secondTurnType, false);
} }
} else if (turnIndex == THIRD_TURN) { } else if (turnIndex == THIRD_TURN) {
if ((TurnType.isLeftTurn(firstTurnType) || TurnType.isLeftTurn(secondTurnType)) && TurnType.isLeftTurn(thirdTurnType)) { if ((TurnType.isLeftTurn(firstTurnType) || TurnType.isLeftTurn(secondTurnType)) && TurnType.isLeftTurn(thirdTurnType)) {