aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-12-18 10:32:02 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-12-18 10:32:02 +1300
commitb580bf533b6f74749b96adf3652f5584425abe69 (patch)
tree5d5a7ffccce8c6633b33d15d561bfa3b68af6781 /src
parent2f3d3bce533b5fe7f5b4f530fa5360db2ba2262d (diff)
downloadtraccar-server-b580bf533b6f74749b96adf3652f5584425abe69.tar.gz
traccar-server-b580bf533b6f74749b96adf3652f5584425abe69.tar.bz2
traccar-server-b580bf533b6f74749b96adf3652f5584425abe69.zip
Do not send position with events
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/api/AsyncSocket.java5
-rw-r--r--src/org/traccar/database/ConnectionManager.java6
-rw-r--r--src/org/traccar/database/NotificationManager.java2
3 files changed, 5 insertions, 8 deletions
diff --git a/src/org/traccar/api/AsyncSocket.java b/src/org/traccar/api/AsyncSocket.java
index 7ac3810fa..b12d5d252 100644
--- a/src/org/traccar/api/AsyncSocket.java
+++ b/src/org/traccar/api/AsyncSocket.java
@@ -76,12 +76,9 @@ public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.U
}
@Override
- public void onUpdateEvent(Event event, Position position) {
+ public void onUpdateEvent(Event event) {
Map<String, Collection<?>> data = new HashMap<>();
data.put(KEY_EVENTS, Collections.singletonList(event));
- if (position != null) {
- data.put(KEY_POSITIONS, Collections.singletonList(position));
- }
sendData(data);
}
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index bc44c31ae..374e9651d 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -146,10 +146,10 @@ public class ConnectionManager {
}
}
- public synchronized void updateEvent(long userId, Event event, Position position) {
+ public synchronized void updateEvent(long userId, Event event) {
if (listeners.containsKey(userId)) {
for (UpdateListener listener : listeners.get(userId)) {
- listener.onUpdateEvent(event, position);
+ listener.onUpdateEvent(event);
}
}
}
@@ -157,7 +157,7 @@ public class ConnectionManager {
public interface UpdateListener {
void onUpdateDevice(Device device);
void onUpdatePosition(Position position);
- void onUpdateEvent(Event event, Position position);
+ void onUpdateEvent(Event event);
}
public synchronized void addListener(long userId, UpdateListener listener) {
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index ee804f5cd..4ae173c6a 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -60,7 +60,7 @@ public class NotificationManager {
Notification notification = getUserNotificationByType(userId, event.getType());
if (notification != null) {
if (notification.getWeb()) {
- Context.getConnectionManager().updateEvent(userId, event, position);
+ Context.getConnectionManager().updateEvent(userId, event);
}
if (notification.getMail()) {
NotificationMail.sendMailAsync(userId, event, position);