1 files changed, 9 insertions, 30 deletions

diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
index 1ea7aee41..a0291dcfa 100644
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -15,30 +15,23 @@
  */
 package org.traccar.events;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import org.traccar.BaseEventHandler;
 import org.traccar.Context;
-import org.traccar.database.DataManager;
 import org.traccar.database.GeofenceManager;
-import org.traccar.helper.Log;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public class GeofenceEventHandler extends BaseEventHandler {
 
-    private int suppressRepeated;
     private GeofenceManager geofenceManager;
-    private DataManager dataManager;
 
     public GeofenceEventHandler() {
-        suppressRepeated = Context.getConfig().getInteger("event.suppressRepeated", 60);
         geofenceManager = Context.getGeofenceManager();
-        dataManager = Context.getDataManager();
     }
 
     @Override
@@ -47,7 +40,7 @@ public class GeofenceEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (position.getId() != device.getPositionId() || !position.getValid()) {
+        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
@@ -63,29 +56,15 @@ public class GeofenceEventHandler extends BaseEventHandler {
         device.setGeofenceIds(currentGeofences);
 
         Collection<Event> events = new ArrayList<>();
-        try {
-            if (dataManager.getLastEvents(position.getDeviceId(),
-                    Event.TYPE_GEOFENCE_ENTER, suppressRepeated).isEmpty()) {
-                for (long geofenceId : newGeofences) {
-                    Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
-                    event.setGeofenceId(geofenceId);
-                    events.add(event);
-                }
-            }
-        } catch (SQLException error) {
-            Log.warning(error);
+        for (long geofenceId : newGeofences) {
+            Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
+            event.setGeofenceId(geofenceId);
+            events.add(event);
         }
-        try {
-            if (dataManager.getLastEvents(position.getDeviceId(),
-                    Event.TYPE_GEOFENCE_EXIT, suppressRepeated).isEmpty()) {
-                for (long geofenceId : oldGeofences) {
-                    Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
-                    event.setGeofenceId(geofenceId);
-                    events.add(event);
-                }
-            }
-        } catch (SQLException error) {
-            Log.warning(error);
+        for (long geofenceId : oldGeofences) {
+            Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
+            event.setGeofenceId(geofenceId);
+            events.add(event);
         }
         return events;
     }