1 files changed, 22 insertions, 18 deletions
diff --git a/src/org/traccar/BaseEventHandler.java b/src/org/traccar/BaseEventHandler.java
index 3e3317f0a..1ae9d2c6d 100644
--- a/src/org/traccar/BaseEventHandler.java
+++ b/src/org/traccar/BaseEventHandler.java
@@ -1,35 +1,39 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.traccar;
 
-import org.traccar.model.Device;
+import java.util.Collection;
+
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public abstract class BaseEventHandler extends BaseDataHandler {
 
-    private boolean isLastPosition = false;
-
-    public boolean isLastPosition() {
-        return isLastPosition;
-    }
-
     @Override
     protected Position handlePosition(Position position) {
 
-        Device device = Context.getDataManager().getDeviceById(position.getDeviceId());
-        if (device != null) {
-            long lastPositionId = device.getPositionId();
-            if (position.getId() == lastPositionId) {
-                isLastPosition = true;
+        Collection<Event> events = analyzePosition(position);
+        if (events != null) {
+            for (Event event : events) {
+                Context.getNotificationManager().updateEvent(event, position);
             }
         }
-
-        Event event = analizePosition(position);
-        if (event != null) {
-            Context.getConnectionManager().updateEvent(event, position);
-        }
         return position;
     }
 
-    protected abstract Event analizePosition(Position position);
+    protected abstract Collection<Event> analyzePosition(Position position);
 
 }