Remove geofence manager

3 files changed, 1 insertions, 84 deletions

diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index 0bac8f642..20f179f2e 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -218,12 +218,6 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
     protected void addNewItem(Device device) {
         super.addNewItem(device);
         addByUniqueId(device);
-        if (Context.getGeofenceManager() != null) {
-            Position lastPosition = getLastPosition(device.getId());
-            if (lastPosition != null) {
-                device.setGeofenceIds(Context.getGeofenceManager().getCurrentDeviceGeofences(lastPosition));
-            }
-        }
     }
 
     @Override
diff --git a/src/main/java/org/traccar/database/GeofenceManager.java b/src/main/java/org/traccar/database/GeofenceManager.java
deleted file mode 100644
index a32847cf9..000000000
--- a/src/main/java/org/traccar/database/GeofenceManager.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- *
- * 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.database;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.traccar.Context;
-import org.traccar.model.Device;
-import org.traccar.model.Geofence;
-import org.traccar.model.Position;
-
-public class GeofenceManager extends ExtendedObjectManager<Geofence> {
-
-    public GeofenceManager(DataManager dataManager) {
-        super(dataManager, Geofence.class);
-    }
-
-    @Override
-    public final void refreshExtendedPermissions() {
-        super.refreshExtendedPermissions();
-        recalculateDevicesGeofences();
-    }
-
-    public List<Long> getCurrentDeviceGeofences(Position position) {
-        List<Long> result = new ArrayList<>();
-        for (long geofenceId : getAllDeviceItems(position.getDeviceId())) {
-            Geofence geofence = getById(geofenceId);
-            if (geofence != null && geofence.getGeometry()
-                    .containsPoint(position.getLatitude(), position.getLongitude())) {
-                result.add(geofenceId);
-            }
-        }
-        return result;
-    }
-
-    public void recalculateDevicesGeofences() {
-        for (Device device : Context.getDeviceManager().getAllDevices()) {
-            List<Long> deviceGeofenceIds = device.getGeofenceIds();
-            if (deviceGeofenceIds == null) {
-                deviceGeofenceIds = new ArrayList<>();
-            } else {
-                deviceGeofenceIds.clear();
-            }
-            Position lastPosition = Context.getIdentityManager().getLastPosition(device.getId());
-            if (lastPosition != null && getAllDeviceItems(device.getId()) != null) {
-                deviceGeofenceIds.addAll(getCurrentDeviceGeofences(lastPosition));
-            }
-            device.setGeofenceIds(deviceGeofenceIds);
-        }
-    }
-
-}
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index e8f2380a2..3c74c0049 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory;
 import org.traccar.Context;
 import org.traccar.model.BaseModel;
 import org.traccar.model.Device;
-import org.traccar.model.Geofence;
 import org.traccar.model.Group;
 import org.traccar.model.ManagedUser;
 import org.traccar.model.Notification;
@@ -356,18 +355,12 @@ public class PermissionsManager {
     }
 
     public void refreshAllUsersPermissions() {
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refreshUserItems();
-        }
         if (Context.getNotificationManager() != null) {
             Context.getNotificationManager().refreshUserItems();
         }
     }
 
     public void refreshAllExtendedPermissions() {
-        if (Context.getGeofenceManager() != null) {
-            Context.getGeofenceManager().refreshExtendedPermissions();
-        }
     }
 
     public void refreshPermissions(Permission permission) {
@@ -378,16 +371,12 @@ public class PermissionsManager {
                 refreshAllExtendedPermissions();
             } else if (permission.getPropertyClass().equals(ManagedUser.class)) {
                 usersManager.refreshUserItems();
-            } else if (permission.getPropertyClass().equals(Geofence.class) && Context.getGeofenceManager() != null) {
-                Context.getGeofenceManager().refreshUserItems();
             } else if (permission.getPropertyClass().equals(Notification.class)
                     && Context.getNotificationManager() != null) {
                 Context.getNotificationManager().refreshUserItems();
             }
         } else if (permission.getOwnerClass().equals(Device.class) || permission.getOwnerClass().equals(Group.class)) {
-            if (permission.getPropertyClass().equals(Geofence.class) && Context.getGeofenceManager() != null) {
-                Context.getGeofenceManager().refreshExtendedPermissions();
-            } else if (permission.getPropertyClass().equals(Notification.class)
+            if (permission.getPropertyClass().equals(Notification.class)
                     && Context.getNotificationManager() != null) {
                 Context.getNotificationManager().refreshExtendedPermissions();
             }