From b588b3c723cad4629dcecbce8983933f7ff2a255 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 14 Jun 2016 18:05:05 +0500
Subject: - Overlapping geofences

- Simplified user-device link
---
 setup/unix/traccar.xml    | 14 +++++++-------
 setup/windows/traccar.xml | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'setup')

diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 37ff31bbe..ab739e4d6 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -118,7 +118,7 @@
     </entry>
 
     <entry key='database.updateDeviceStatus'>
-        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion, geofenceId = :geofenceId WHERE id = :id;
+        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id;
     </entry>
 
     <entry key='database.deleteDevice'>
@@ -238,16 +238,16 @@
         DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId;
     </entry>
 
-    <entry key='database.selectUserDeviceGeofences'>
-        SELECT userId, deviceId, geofenceId FROM user_device_geofence;
+    <entry key='database.selectDeviceGeofences'>
+        SELECT deviceId, geofenceId FROM device_geofence;
     </entry>
 
-    <entry key='database.linkUserDeviceGeofence'>
-        INSERT INTO user_device_geofence (userId, deviceId, geofenceId) VALUES (:userId, :deviceId, :geofenceId);
+    <entry key='database.linkDeviceGeofence'>
+        INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId);
     </entry>
 
-    <entry key='database.unlinkUserDeviceGeofence'>
-        DELETE FROM user_device_geofence WHERE userId = :userId AND deviceId = :deviceId AND geofenceId = :geofenceId;
+    <entry key='database.unlinkDeviceGeofence'>
+        DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId;
     </entry>
 
     <!-- PROTOCOL CONFIG -->
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 5f86e53b0..17f2ab4f3 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -118,7 +118,7 @@
     </entry>
 
     <entry key='database.updateDeviceStatus'>
-        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion, geofenceId = :geofenceId WHERE id = :id;
+        UPDATE devices SET status = :status, lastUpdate = :lastUpdate, motion = :motion WHERE id = :id;
     </entry>
 
     <entry key='database.deleteDevice'>
@@ -238,16 +238,16 @@
         DELETE FROM group_geofence WHERE groupId = :groupId AND geofenceId = :geofenceId;
     </entry>
 
-    <entry key='database.selectUserDeviceGeofences'>
-        SELECT userId, deviceId, geofenceId FROM user_device_geofence;
+    <entry key='database.selectDeviceGeofences'>
+        SELECT deviceId, geofenceId FROM device_geofence;
     </entry>
 
-    <entry key='database.linkUserDeviceGeofence'>
-        INSERT INTO user_device_geofence (userId, deviceId, geofenceId) VALUES (:userId, :deviceId, :geofenceId);
+    <entry key='database.linkDeviceGeofence'>
+        INSERT INTO device_geofence (deviceId, geofenceId) VALUES (:deviceId, :geofenceId);
     </entry>
 
-    <entry key='database.unlinkUserDeviceGeofence'>
-        DELETE FROM user_device_geofence WHERE userId = :userId AND deviceId = :deviceId AND geofenceId = :geofenceId;
+    <entry key='database.unlinkDeviceGeofence'>
+        DELETE FROM device_geofence WHERE deviceId = :deviceId AND geofenceId = :geofenceId;
     </entry>
 
     <!-- PROTOCOL CONFIG -->
-- 
cgit v1.2.3