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

align numbers better

Browse source
This commit is contained in:
sonora 2015-09-04 21:04:58 +02:00
parent c00b891192
commit 213af20305
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/routing/VoiceRouter.java
View file

@ -147,7 +147,7 @@ public class VoiceRouter {
PREPARE_DISTANCE = 1500; // [125 sec]
PREPARE_DISTANCE_END = 1200; // [100 sec]
TURN_IN_DISTANCE = 390; // 30 sec
TURN_IN_DISTANCE_END = 182; // 14 sec
TURN_IN_DISTANCE_END = 195; // 15 sec
TURN_DISTANCE = 50; // 7 sec
TURN_DEFAULT_SPEED = 7f; // 25 km/h
DEFAULT_SPEED = 13; // 48 km/h
@ -393,10 +393,10 @@ public class VoiceRouter {
*/
protected void updateStatus(Location currentLocation, boolean repeat) {
// Directly after turn: goAhead (dist), unless:
// < PREPARE_LONG_DISTANCE (3000m): playPrepareTurn
// < PREPARE_DISTANCE (1500m): playPrepareTurn
// < TURN_IN_DISTANCE (300m or 25sec): playMakeTurnIn
// < TURN_DISTANCE (60m or 5sec): playMakeTurn
// < PREPARE_LONG_DISTANCE (e.g. 3500m): playPrepareTurn
// < PREPARE_DISTANCE (e.g. 1500m): playPrepareTurn
// < TURN_IN_DISTANCE (e.g. 390m or 30sec): playMakeTurnIn
// < TURN_DISTANCE (e.g. 50m or 7sec): playMakeTurn
float speed = DEFAULT_SPEED;
if (currentLocation != null && currentLocation.hasSpeed()) {
speed = Math.max(currentLocation.getSpeed(), speed);