Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-05 22:15:32 +02:00
commit db0e580052

View file

@ -184,9 +184,9 @@ public class VoiceRouter {
if(loc != null && loc.hasSpeed()) { if(loc != null && loc.hasSpeed()) {
speed = loc.getSpeed(); speed = loc.getSpeed();
} }
if (isDistanceLess(speed, dist, TURN_IN_DISTANCE_END, 0f)) { if (isDistanceLess(speed, dist, TURN_DISTANCE, 0f)) {
return 0; return 0;
} else if ( dist <= PREPARE_DISTANCE) { } else if (dist <= PREPARE_DISTANCE) {
return 1; return 1;
} else if (dist <= PREPARE_LONG_DISTANCE) { } else if (dist <= PREPARE_LONG_DISTANCE) {
return 2; return 2;