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

create test build for suppression of ghost turns where regular turn is already indicated

Browse source
This commit is contained in:
sonora 2016-05-24 10:42:36 +02:00
parent b15ca2b4ce
commit 58fe2b79aa
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -795,7 +795,7 @@ public class RouteResultPreparation {
}
protected TurnType createKeepLeftRightTurnBasedOnTurnTypes(RoadSplitStructure rs, RouteSegmentResult prevSegm,
RouteSegmentResult currentSegm, String turnLanes,boolean leftSide) {
RouteSegmentResult currentSegm, String turnLanes, boolean leftSide) {
// Maybe going straight at a 90-degree intersection
TurnType t = TurnType.valueOf(TurnType.C, leftSide);
int[] rawLanes = calculateRawTurnLanes(turnLanes, TurnType.C);
@ -837,6 +837,10 @@ public class RouteResultPreparation {
}
}
}
//Test suppressing 'ghost turns' where lanes split with no action (go staight) or a subsequent turn will be announced anyway. This mostly causes Issue 2571.
if (t == TurnType.valueOf(TurnType.C, leftSide)) {
rs.speak = false;
}
t.setSkipToSpeak(!rs.speak);
t.setLanes(rawLanes);
return t;
@ -930,6 +934,7 @@ public class RouteResultPreparation {
TurnType t = null;
if (rs.keepLeft && rs.keepRight) {
t = TurnType.valueOf(TurnType.C, leftSide);
rs.speak = false;
} else if (rs.keepLeft) {
t = TurnType.valueOf(makeSlightTurn ? TurnType.TSLL : TurnType.KL, leftSide);
} else if (rs.keepRight) {