From 4109447d0adc778b246543b77672c280d58da8bf Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 18 Jun 2016 07:59:43 +0500 Subject: - Update Geofences API and Manager a bit - Show geofence name in event toasts - Link/Unlink geofences to users, devices and groups --- src/org/traccar/database/GeofenceManager.java | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/database') diff --git a/src/org/traccar/database/GeofenceManager.java b/src/org/traccar/database/GeofenceManager.java index 0a07e2cf3..3f4d4c5ce 100644 --- a/src/org/traccar/database/GeofenceManager.java +++ b/src/org/traccar/database/GeofenceManager.java @@ -70,6 +70,15 @@ public class GeofenceManager { return groupGeofences.get(groupId); } + public Set getGroupGeofencesIds(long groupId) { + groupGeofencesLock.readLock().lock(); + try { + return getGroupGeofences(groupId); + } finally { + groupGeofencesLock.readLock().unlock(); + } + } + public Set getAllDeviceGeofences(long deviceId) { deviceGeofencesLock.readLock().lock(); try { @@ -77,10 +86,9 @@ public class GeofenceManager { } finally { deviceGeofencesLock.readLock().unlock(); } - } - public Set getDeviceGeofences(long deviceId) { + public Set getDeviceGeofencesIds(long deviceId) { deviceGeofencesLock.readLock().lock(); try { return getDeviceGeofences(deviceGeofences, deviceId); @@ -174,11 +182,20 @@ public class GeofenceManager { } } - public final Collection getUserGeofences(long userId) { + public final Set getAllGeofencesIds() { + geofencesLock.readLock().lock(); + try { + return geofences.keySet(); + } finally { + geofencesLock.readLock().unlock(); + } + } + + public final Collection getGeofences(Set geofencesIds) { geofencesLock.readLock().lock(); try { Collection result = new LinkedList<>(); - for (Long geofenceId : getUserGeofencesIds(userId)) { + for (Long geofenceId : geofencesIds) { result.add(getGeofence(geofenceId)); } return result; -- cgit v1.2.3