Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-02-13 00:26:39 +01:00
commit 9416ee1963

View file

@ -119,7 +119,7 @@ public class AlarmInfo implements LocationPoint {
public int updateDistanceAndGetPriority(float time, float distance) {
if (distance > 1500) {
return 0;
return Integer.MAX_VALUE;
}
// 1 level of priorities
if (time < 8 || distance < 100 || type == AlarmInfoType.SPEED_LIMIT) {
@ -129,10 +129,10 @@ public class AlarmInfo implements LocationPoint {
return type.getPriority();
}
// 2nd level
if (time < 10 || distance < 150) {
if (time < 7 || distance < 100) {
return type.getPriority() + AlarmInfoType.MAXIMUM.getPriority();
}
return 0;
return Integer.MAX_VALUE;
}
@Override