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

consistent sorting

Browse source
This commit is contained in:
sonora 2021-01-03 11:15:19 +01:00
parent da3318db9a
commit a888e6e547
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/src/net/osmand/plus/routing/data/AnnounceTimeDistances.java
View file

@ -97,10 +97,10 @@ public class AnnounceTimeDistances {
OFF_ROUTE_DISTANCE = DEFAULT_SPEED * 20 * ARRIVAL_DISTANCE_FACTOR; // 20 seconds OFF_ROUTE_DISTANCE = DEFAULT_SPEED * 20 * ARRIVAL_DISTANCE_FACTOR; // 20 seconds
// assume for backward compatibility speed - 10 m/s // assume for backward compatibility speed - 10 m/s
LONG_PNT_ANNOUNCE_RADIUS = (int) (60 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 600 m
SHORT_PNT_ANNOUNCE_RADIUS = (int) (15 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 150 m
LONG_ALARM_ANNOUNCE_RADIUS = (int) (12 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 120 m
SHORT_ALARM_ANNOUNCE_RADIUS = (int) (7 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 70 m SHORT_ALARM_ANNOUNCE_RADIUS = (int) (7 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 70 m
LONG_ALARM_ANNOUNCE_RADIUS = (int) (12 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 120 m
SHORT_PNT_ANNOUNCE_RADIUS = (int) (15 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 150 m
LONG_PNT_ANNOUNCE_RADIUS = (int) (60 * DEFAULT_SPEED * ARRIVAL_DISTANCE_FACTOR); // 600 m
// Trigger close prompts earlier to allow BT SCO link being established, or when VOICE_PROMPT_DELAY is set >0 for the other stream types // Trigger close prompts earlier to allow BT SCO link being established, or when VOICE_PROMPT_DELAY is set >0 for the other stream types
int ams = settings.AUDIO_MANAGER_STREAM.getModeValue(appMode); int ams = settings.AUDIO_MANAGER_STREAM.getModeValue(appMode);
@ -125,22 +125,22 @@ public class AnnounceTimeDistances {
public boolean isTurnStateActive(float currentSpeed, double dist, int turnType) { public boolean isTurnStateActive(float currentSpeed, double dist, int turnType) {
switch (turnType) { switch (turnType) {
case STATE_TURN_NOW:
return isDistanceLess(currentSpeed, dist, TURN_NOW_DISTANCE, TURN_NOW_SPEED);
case STATE_TURN_IN: case STATE_TURN_IN:
return isDistanceLess(currentSpeed, dist, TURN_IN_DISTANCE); return isDistanceLess(currentSpeed, dist, TURN_IN_DISTANCE);
case STATE_PREPARE_TURN: case STATE_PREPARE_TURN:
return isDistanceLess(currentSpeed, dist, PREPARE_DISTANCE); return isDistanceLess(currentSpeed, dist, PREPARE_DISTANCE);
case STATE_LONG_PREPARE_TURN: case STATE_LONG_PREPARE_TURN:
return isDistanceLess(currentSpeed, dist, PREPARE_LONG_DISTANCE); return isDistanceLess(currentSpeed, dist, PREPARE_LONG_DISTANCE);
case STATE_TURN_NOW:
return isDistanceLess(currentSpeed, dist, TURN_NOW_DISTANCE, TURN_NOW_SPEED);
case STATE_LONG_PNT_APPROACH:
return isDistanceLess(currentSpeed, dist, LONG_PNT_ANNOUNCE_RADIUS);
case STATE_SHORT_PNT_APPROACH:
return isDistanceLess(currentSpeed, dist, SHORT_PNT_ANNOUNCE_RADIUS);
case STATE_LONG_ALARM_ANNOUNCE:
return isDistanceLess(currentSpeed, dist, LONG_ALARM_ANNOUNCE_RADIUS);
case STATE_SHORT_ALARM_ANNOUNCE: case STATE_SHORT_ALARM_ANNOUNCE:
return isDistanceLess(currentSpeed, dist, SHORT_ALARM_ANNOUNCE_RADIUS); return isDistanceLess(currentSpeed, dist, SHORT_ALARM_ANNOUNCE_RADIUS);
case STATE_LONG_ALARM_ANNOUNCE:
return isDistanceLess(currentSpeed, dist, LONG_ALARM_ANNOUNCE_RADIUS);
case STATE_SHORT_PNT_APPROACH:
return isDistanceLess(currentSpeed, dist, SHORT_PNT_ANNOUNCE_RADIUS);
case STATE_LONG_PNT_APPROACH:
return isDistanceLess(currentSpeed, dist, LONG_PNT_ANNOUNCE_RADIUS);
} }
return false; return false;
} }