- Overlapping geofences

- Simplified user-device link

3 files changed, 8 insertions, 17 deletions

diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java
index 45c3d46dc..c42eb3718 100644
--- a/src/org/traccar/model/Device.java
+++ b/src/org/traccar/model/Device.java
@@ -16,6 +16,7 @@
 package org.traccar.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class Device {
 
@@ -114,13 +115,13 @@ public class Device {
         this.motion = motion;
     }
 
-    private long geofenceId;
+    private List<Long> geofenceIds;
 
-    public long getGeofenceId() {
-        return geofenceId;
+    public List<Long> getGeofenceIds() {
+        return geofenceIds;
     }
 
-    public void setGeofenceId(long geofenceId) {
-        this.geofenceId = geofenceId;
+    public void setGeofenceIds(List<Long> geofenceIds) {
+        this.geofenceIds = geofenceIds;
     }
 }
diff --git a/src/org/traccar/model/UserDeviceGeofence.java b/src/org/traccar/model/DeviceGeofence.java
index c84aa46b8..f55c8ca69 100644
--- a/src/org/traccar/model/UserDeviceGeofence.java
+++ b/src/org/traccar/model/DeviceGeofence.java
@@ -1,16 +1,6 @@
 package org.traccar.model;
 
-public class UserDeviceGeofence {
-
-    private long userId;
-
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
+public class DeviceGeofence {
 
     private long deviceId;
 
diff --git a/src/org/traccar/model/Geofence.java b/src/org/traccar/model/Geofence.java
index 0723c21e0..300d8fb74 100644
--- a/src/org/traccar/model/Geofence.java
+++ b/src/org/traccar/model/Geofence.java
@@ -60,7 +60,7 @@ public class Geofence extends Extensible {
     }
 
     public void setGeometry(GeofenceGeometry geometry) {
-        area = geometry.toWKT();
+        area = geometry.toWkt();
         this.geometry = geometry;
     }