diff options
| author | Evgeny S Maksimov <admin@vragam.net> | 2019-02-14 19:10:17 +0300 |
|---|---|---|
| committer | Evgeny S Maksimov <admin@vragam.net> | 2019-02-14 19:10:17 +0300 |
| commit | 823bc46474e40f0fdb678f22e1269f32f75264c2 (patch) | |
| tree | d54106ac36667c2673ba6ffcd57dbe623f09c9e3 | |
| parent | 36b5e6a4c78cc8046f41cbd4bbb660a0bf7482ed (diff) | |
| download | traccar-server-823bc46474e40f0fdb678f22e1269f32f75264c2.tar.gz traccar-server-823bc46474e40f0fdb678f22e1269f32f75264c2.tar.bz2 traccar-server-823bc46474e40f0fdb678f22e1269f32f75264c2.zip | |
Fixed geofences processing order
| -rw-r--r-- | src/org/traccar/events/GeofenceEventHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java index ea379dbdb..313553195 100644 --- a/src/org/traccar/events/GeofenceEventHandler.java +++ b/src/org/traccar/events/GeofenceEventHandler.java @@ -60,20 +60,20 @@ public class GeofenceEventHandler extends BaseEventHandler { device.setGeofenceIds(currentGeofences); Map<Event, Position> events = new HashMap<>(); - for (long geofenceId : newGeofences) { + for (long geofenceId : oldGeofences) { long calendarId = geofenceManager.getById(geofenceId).getCalendarId(); Calendar calendar = calendarId != 0 ? Context.getCalendarManager().getById(calendarId) : null; if (calendar == null || calendar.checkMoment(position.getFixTime())) { - Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId()); + Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId()); event.setGeofenceId(geofenceId); events.put(event, position); } } - for (long geofenceId : oldGeofences) { + for (long geofenceId : newGeofences) { long calendarId = geofenceManager.getById(geofenceId).getCalendarId(); Calendar calendar = calendarId != 0 ? Context.getCalendarManager().getById(calendarId) : null; if (calendar == null || calendar.checkMoment(position.getFixTime())) { - Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId()); + Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId()); event.setGeofenceId(geofenceId); events.put(event, position); } |