aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/GeofenceManager.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-16 12:33:32 +1200
committerGitHub <noreply@github.com>2016-07-16 12:33:32 +1200
commit6aa4a84c9ef97f5d7980e71cf524a445e87de714 (patch)
treea3e90f40f0c42cc59a6654965ff3dcf37d8d99cb /src/org/traccar/database/GeofenceManager.java
parent6fefd48ab48a2382a9a7bc07e168b48a1ce8bc40 (diff)
parentd71210f1f408c757d4fe3da07829bbc3362a7e93 (diff)
downloadtrackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.tar.gz
trackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.tar.bz2
trackermap-server-6aa4a84c9ef97f5d7980e71cf524a445e87de714.zip
Merge pull request #2116 from Abyss777/device_manager_final
Move code related to devices to DeviceManager
Diffstat (limited to 'src/org/traccar/database/GeofenceManager.java')
-rw-r--r--src/org/traccar/database/GeofenceManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/GeofenceManager.java b/src/org/traccar/database/GeofenceManager.java
index c35e19e9a..dc31172b9 100644
--- a/src/org/traccar/database/GeofenceManager.java
+++ b/src/org/traccar/database/GeofenceManager.java
@@ -173,7 +173,7 @@ public class GeofenceManager {
.add(deviceGeofence.getGeofenceId());
}
- for (Device device : dataManager.getAllDevicesCached()) {
+ for (Device device : Context.getDeviceManager().getAllDevices()) {
long groupId = device.getGroupId();
while (groupId != 0) {
getDeviceGeofences(deviceGeofencesWithGroups,
@@ -190,7 +190,7 @@ public class GeofenceManager {
} else {
deviceGeofenceIds.clear();
}
- Position lastPosition = Context.getConnectionManager().getLastPosition(device.getId());
+ Position lastPosition = Context.getIdentityManager().getLastPosition(device.getId());
if (lastPosition != null && deviceGeofencesWithGroups.containsKey(device.getId())) {
for (long geofenceId : deviceGeofencesWithGroups.get(device.getId())) {
Geofence geofence = getGeofence(geofenceId);