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

Missing TODO

Browse source
This commit is contained in:
sonora 2015-09-05 10:46:51 +02:00
parent 7107443b09
commit 4c6c6a5d51
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -388,10 +388,10 @@ public class VoiceRouter {
return System.currentTimeMillis() > notBefore; return System.currentTimeMillis() > notBefore;
} }
/** /**
* Updates status of voice guidance * Updates status of voice guidance
* @param currentLocation * @param currentLocation
*/ */
protected void updateStatus(Location currentLocation, boolean repeat) { protected void updateStatus(Location currentLocation, boolean repeat) {
// Directly after turn: goAhead (dist), unless: // Directly after turn: goAhead (dist), unless:
// < PREPARE_LONG_DISTANCE (e.g. 3500m): playPrepareTurn // < PREPARE_LONG_DISTANCE (e.g. 3500m): playPrepareTurn
@ -404,14 +404,14 @@ public class VoiceRouter {
} }
NextDirectionInfo nextInfo = router.getNextRouteDirectionInfo(new NextDirectionInfo(), true); NextDirectionInfo nextInfo = router.getNextRouteDirectionInfo(new NextDirectionInfo(), true);
RouteSegmentResult currentSegment = router.getCurrentSegmentResult(); RouteSegmentResult currentSegment = router.getCurrentSegmentResult();
if (nextInfo.directionInfo == null) { if (nextInfo.directionInfo == null) {
return; return;
} }
int dist = nextInfo.distanceTo; int dist = nextInfo.distanceTo;
RouteDirectionInfo next = nextInfo.directionInfo; RouteDirectionInfo next = nextInfo.directionInfo;
// if routing is changed update status to unknown // If routing is changed update status to unknown
if (next != nextRouteDirection) { if (next != nextRouteDirection) {
nextRouteDirection = next; nextRouteDirection = next;
currentStatus = STATUS_UNKNOWN; currentStatus = STATUS_UNKNOWN;
@ -432,7 +432,7 @@ public class VoiceRouter {
} }
} }
// Tell goAhead distance after route calculation if no otherprompt is due, or after a turn if next turn is more than PREPARE_LONG_DISTANCE away // TODO: Tell goAhead distance after route calculation if no other prompt is due, or after a turn if next turn is more than PREPARE_LONG_DISTANCE away
if (currentStatus == STATUS_UNKNOWN) { if (currentStatus == STATUS_UNKNOWN) {
if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3, 0f)) { if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3, 0f)) {
playGoAheadDist = dist - 80; playGoAheadDist = dist - 80;