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

Move arrival constants to voice router

Browse source
This commit is contained in:
Victor Shcherb 2021-01-01 22:15:47 +01:00
parent 67e71c992b
commit dba6af888a
2 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -50,10 +50,6 @@ public class RoutingHelper {
private static final float POS_TOLERANCE = 60; // 60m or 30m + accuracy
private static final float POS_TOLERANCE_DEVIATION_MULTIPLIER = 2;
// This should be correlated with RoutingHelper.updateCurrentRouteStatus ( when processed turn now is not announced)
public static final int DEFAULT_GPS_TOLERANCE = 12;
private static float ARRIVAL_DISTANCE_FACTOR = 1;
private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<>();
private List<WeakReference<IRoutingDataUpdateListener>> updateListeners = new LinkedList<>();
private List<WeakReference<IRouteSettingsListener>> settingsListeners = new LinkedList<>();
@ -303,7 +299,6 @@ public class RoutingHelper {
public void setAppMode(ApplicationMode mode) {
this.mode = mode;
ARRIVAL_DISTANCE_FACTOR = Math.max(settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(mode), 0.1f);
voiceRouter.updateAppMode();
}
@ -474,9 +469,7 @@ public class RoutingHelper {
voiceRouter.interruptRouteCommands();
voiceRouterStopped = true; // Prevents excessive execution of stop() code
}
if (distOrth > mode.getOffRouteDistance() * ARRIVAL_DISTANCE_FACTOR && !settings.DISABLE_OFFROUTE_RECALC.get()) {
voiceRouter.announceOffRoute(distOrth);
}
voiceRouter.announceOffRoute(distOrth);
}
// calculate projection of current location
@ -566,7 +559,7 @@ public class RoutingHelper {
// 2. check if intermediate found
if (route.getIntermediatePointsToPass() > 0
&& route.getDistanceToNextIntermediate(lastFixedLocation) < getArrivalDistance(mode, settings) && !isRoutePlanningMode) {
&& route.getDistanceToNextIntermediate(lastFixedLocation) < voiceRouter.getArrivalDistance() && !isRoutePlanningMode) {
showMessage(app.getString(R.string.arrived_at_intermediate_point));
route.passIntermediatePoint();
TargetPointsHelper targets = app.getTargetPointsHelper();
@ -598,7 +591,7 @@ public class RoutingHelper {
// 3. check if destination found
Location lastPoint = routeNodes.get(routeNodes.size() - 1);
if (currentRoute > routeNodes.size() - 3
&& currentLocation.distanceTo(lastPoint) < getArrivalDistance(mode, settings)
&& currentLocation.distanceTo(lastPoint) < voiceRouter.getArrivalDistance()
&& !isRoutePlanningMode) {
//showMessage(app.getString(R.string.arrived_at_destination));
TargetPointsHelper targets = app.getTargetPointsHelper();
@ -666,16 +659,6 @@ public class RoutingHelper {
return false;
}
float getArrivalDistance(ApplicationMode mode, OsmandSettings settings) {
ApplicationMode m = mode == null ? settings.getApplicationMode() : mode;
float defaultSpeed = Math.max(0.3f, m.getDefaultSpeed());
/// Used to be: car - 90 m, bicycle - 50 m, pedestrian - 20 m
// return ((float)settings.getApplicationMode().getArrivalDistance()) * settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(m);
// GPS_TOLERANCE - 12 m
// 5 seconds: car - 80 m @ 50 kmh, bicycle - 45 m @ 25 km/h, bicycle - 25 m @ 10 km/h, pedestrian - 18 m @ 4 km/h,
return (DEFAULT_GPS_TOLERANCE + defaultSpeed * 5) * RoutingHelper.ARRIVAL_DISTANCE_FACTOR;
}
private static float getPosTolerance(float accuracy) {
if (accuracy > 0) {

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

@ -52,11 +52,16 @@ public class VoiceRouter {
public static final String FROM_STREET_NAME = "fromStreetName";
public static final String FROM_DEST = "fromDest";
// TODO combine into helper class
private static final int DEFAULT_GPS_TOLERANCE = 12;
private static float ARRIVAL_DISTANCE_FACTOR = 1;
protected CommandPlayer player;
protected final OsmandApplication app;
protected final RoutingHelper router;
protected OsmandSettings settings;
private ApplicationMode appMode;
private int currentStatus = STATUS_UNKNOWN;
private boolean playedAndArriveAtTarget = false;
@ -90,6 +95,7 @@ public class VoiceRouter {
private VoiceCommandPending pendingCommand = null;
private RouteDirectionInfo nextRouteDirection;
public interface VoiceMessageListener {
void onVoiceMessage(List<String> listCommands, List<String> played);
}
@ -180,7 +186,8 @@ public class VoiceRouter {
public void updateAppMode() {
ApplicationMode appMode = router.getAppMode() == null ? settings.getApplicationMode() : router.getAppMode();
appMode = router.getAppMode() == null ? settings.getApplicationMode() : router.getAppMode();
ARRIVAL_DISTANCE_FACTOR = Math.max(settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(appMode), 0.1f);
if (appMode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
// keep it as minimum 30 kmh for voice announcement
DEFAULT_SPEED = (float) Math.max(8, appMode.getDefaultSpeed());
@ -231,7 +238,7 @@ public class VoiceRouter {
// TURN_NOW_DISTANCE = (int) (DEFAULT_SPEED * 3.6); // 3.6 sec
// 50 kmh - 48 m (car), 10 kmh - 20 m, 4 kmh - 15 m, 1 kmh - 12 m
float factor = Math.max(settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(appMode), 0.1f);
TURN_NOW_DISTANCE = (int) ((RoutingHelper.DEFAULT_GPS_TOLERANCE + DEFAULT_SPEED * 2.5) * factor); // 3.6 sec
TURN_NOW_DISTANCE = (int) ((DEFAULT_GPS_TOLERANCE + DEFAULT_SPEED * 2.5) * factor); // 3.6 sec
TURN_NOW_SPEED = TURN_NOW_DISTANCE / TURN_NOW_TIME;
}
@ -289,22 +296,35 @@ public class VoiceRouter {
private boolean statusNotPassed(int statusToCheck) {
return currentStatus <= statusToCheck;
}
public float getArrivalDistance() {
ApplicationMode m = appMode;
float defaultSpeed = Math.max(0.3f, m.getDefaultSpeed());
/// Used to be: car - 90 m, bicycle - 50 m, pedestrian - 20 m
// return ((float)settings.getApplicationMode().getArrivalDistance()) * settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(m);
// GPS_TOLERANCE - 12 m
// 5 seconds: car - 80 m @ 50 kmh, bicycle - 45 m @ 25 km/h, bicycle - 25 m @ 10 km/h, pedestrian - 18 m @ 4 km/h,
return (DEFAULT_GPS_TOLERANCE + defaultSpeed * 5) * ARRIVAL_DISTANCE_FACTOR;
}
public void announceOffRoute(double dist) {
long ms = System.currentTimeMillis();
if (waitAnnouncedOffRoute == 0 || ms - lastAnnouncedOffRoute > waitAnnouncedOffRoute) {
CommandBuilder p = getNewCommandPlayerToPlay();
if (p != null) {
p.offRoute(dist);
announceBackOnRoute = true;
if (dist > appMode.getOffRouteDistance() * ARRIVAL_DISTANCE_FACTOR && !settings.DISABLE_OFFROUTE_RECALC.get()) {
long ms = System.currentTimeMillis();
if (waitAnnouncedOffRoute == 0 || ms - lastAnnouncedOffRoute > waitAnnouncedOffRoute) {
CommandBuilder p = getNewCommandPlayerToPlay();
if (p != null) {
p.offRoute(dist);
announceBackOnRoute = true;
}
play(p);
if (waitAnnouncedOffRoute == 0) {
waitAnnouncedOffRoute = 60000;
} else {
waitAnnouncedOffRoute *= 2.5;
}
lastAnnouncedOffRoute = ms;
}
play(p);
if (waitAnnouncedOffRoute == 0) {
waitAnnouncedOffRoute = 60000;
} else {
waitAnnouncedOffRoute *= 2.5;
}
lastAnnouncedOffRoute = ms;
}
}