Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
815bafdf8e
1 changed files with 3 additions and 0 deletions
|
@ -128,6 +128,9 @@ public class AlarmInfo implements LocationPoint {
|
|||
if (type == AlarmInfoType.SPEED_CAMERA && (time < 15 || distance < 150)) {
|
||||
return type.getPriority();
|
||||
}
|
||||
if (type == AlarmInfoType.TOLL_BOOTH && (time < 30 || distance < 500)) {
|
||||
return type.getPriority();
|
||||
}
|
||||
// 2nd level
|
||||
if (time < 7 || distance < 100) {
|
||||
return type.getPriority() + AlarmInfoType.MAXIMUM.getPriority();
|
||||
|
|
Loading…
Reference in a new issue