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

Fix map updates

Browse source
This commit is contained in:
Victor Shcherb 2012-06-30 19:10:02 +02:00
parent c9c7c38d1a
commit 1596cf640d
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,6 +183,23 @@ public class VoiceRouter {
// however it should be checked manually ? // however it should be checked manually ?
return; return;
} }
// say how much to go if there is next turn is a bit far
if (currentStatus == STATUS_UNKNOWN) {
if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3)) {
playGoAhead(dist);
}
// say long distance message only for long distances > 10 km
// if (dist >= PREPARE_LONG_DISTANCE && !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)) {
if (dist > 3 * PREPARE_LONG_DISTANCE) {
nextStatusAfter(STATUS_UNKNOWN);
} else if (dist > 1.5 * PREPARE_DISTANCE) {
// say prepare message if it is far enough
nextStatusAfter(STATUS_LONG_PREPARE);
} else {
// don't say even prepare message
nextStatusAfter(STATUS_PREPARE);
}
}
RouteDirectionInfo nextNext = router.getNextNextRouteDirectionInfo(); RouteDirectionInfo nextNext = router.getNextNextRouteDirectionInfo();
@ -215,21 +232,8 @@ public class VoiceRouter {
} }
nextStatusAfter(STATUS_LONG_PREPARE); nextStatusAfter(STATUS_LONG_PREPARE);
} else if (statusNotPassed(STATUS_UNKNOWN)){ } else if (statusNotPassed(STATUS_UNKNOWN)){
//if (dist >= PREPARE_LONG_DISTANCE && !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)) { // strange how we get here but
// say how much to go if there is next turn is a bit far nextStatusAfter(STATUS_UNKNOWN);
if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.5)) {
playGoAhead(dist);
}
// say long distance message only for long distances > 10 km
if(dist > 3 * PREPARE_LONG_DISTANCE) {
nextStatusAfter(STATUS_UNKNOWN);
} else if(dist > 1.5 * PREPARE_DISTANCE) {
// say prepare message if it is far enough
nextStatusAfter(STATUS_LONG_PREPARE);
} else {
// don't say even prepare message
nextStatusAfter(STATUS_PREPARE);
}
} }
} }