Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
218d79dcd2
1 changed files with 5 additions and 2 deletions
|
@ -500,9 +500,12 @@ public class VoiceRouter {
|
||||||
if(isTargetPoint(nextInfo) && (!playedAndArriveAtTarget || repeat)) {
|
if(isTargetPoint(nextInfo) && (!playedAndArriveAtTarget || repeat)) {
|
||||||
if(next.getTurnType().goAhead()) {
|
if(next.getTurnType().goAhead()) {
|
||||||
playGoAhead(nextInfo.distanceTo, getSpeakableStreetName(currentSegment, next));
|
playGoAhead(nextInfo.distanceTo, getSpeakableStreetName(currentSegment, next));
|
||||||
|
andSpeakArriveAtPoint(nextInfo);
|
||||||
|
playedAndArriveAtTarget = true;
|
||||||
|
} else if(nextInfo.distanceTo <= 2 * TURN_IN_DISTANCE) {
|
||||||
|
andSpeakArriveAtPoint(nextInfo);
|
||||||
|
playedAndArriveAtTarget = true;
|
||||||
}
|
}
|
||||||
andSpeakArriveAtPoint(nextInfo);
|
|
||||||
playedAndArriveAtTarget = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue