Release version 2.0v2.0

1 files changed, 40 insertions, 48 deletions

diff --git a/setup/linux/linux.cfg b/setup/linux/linux.cfg
index 6b60d5edc..16dc51e6f 100644
--- a/setup/linux/linux.cfg
+++ b/setup/linux/linux.cfg
@@ -6,6 +6,7 @@
 
     <!-- Global confiduration -->
     <entry key="database.driver">org.h2.Driver</entry>
+    <entry key="database.dataSource">org.h2.jdbcx.JdbcDataSource</entry>
     <entry key="database.url">jdbc:h2:/opt/traccar/data/database</entry>
     <entry key="database.user">sa</entry>
     <entry key="database.password"></entry>
@@ -13,59 +14,17 @@
     <!-- Database refresh delay in seconds -->
     <entry key="database.refreshDelay">300</entry>
 
-    <!-- Create database schema -->
-    <entry key="database.initialize">
-        CREATE TABLE IF NOT EXISTS devices (id INT IDENTITY, imei VARCHAR(16));
-        CREATE TABLE IF NOT EXISTS positions (device_id INT, time TIMESTAMP, valid BOOLEAN, latitude DOUBLE, longitude DOUBLE, speed DOUBLE, course DOUBLE, power DOUBLE);
-    </entry>
-
     <!-->
-        id - Integer
+        id - Long
         imei - String
     <-->
     <entry key="database.selectDevice">
-        SELECT id, imei
+        SELECT id, uniqueId as imei
         FROM devices;
     </entry>
 
     <!-->
-        imei - String
-    <-->
-    <entry key="database.insertDevice">
-        INSERT INTO devices (imei)
-        VALUES (:imei);
-    </entry>
-
-    <!-->
-        id - Integer
-        imei - String
-    <-->
-    <entry key="database.updateDevice">
-        UPDATE devices
-        SET imei = :imei
-        WHERE id = :id;
-    </entry>
-
-    <!-->
-        id - Integer
-    <-->
-    <entry key="database.deleteDevice">
-        DELETE FROM devices
-        WHERE id = :id;
-    </entry>
-
-    <!-->
-        device_id - Integer
-    <-->
-    <entry key="database.selectPosition">
-        SELECT *
-        FROM positions
-        WHERE device_id = :device_id
-        ORDER by time DESC;
-    </entry>
-
-    <!-->
-        device_id - Integer
+        device_id - Long
         time - Date
         valid - Boolean
         latitude - Double
@@ -76,13 +35,22 @@
         extended_info - String (XML)
     <-->
     <entry key="database.insertPosition">
-        INSERT INTO positions (device_id, time, valid, latitude, longitude, speed, course, power)
-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power);
+        INSERT INTO positions (device_id, time, valid, latitude, longitude, altitude, speed, course, power)
+	VALUES (:device_id, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :power);
+    </entry>
+
+    <!-->
+        device_id - Long
+        id - Long
+    <-->
+    <entry key="database.updateLatestPosition">
+        UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
     </entry>
 
     <!-- Web interface port -->
     <entry key="http.enable">true</entry>
     <entry key="http.port">8082</entry>
+    <entry key="http.application">/opt/traccar/traccar-web.war</entry>
 
     <!-- Logging options -->
     <entry key="logger.enable">true</entry>
@@ -183,5 +151,29 @@
     <!-- GT06 server configuration -->
     <entry key="gt06.enable">true</entry>
     <entry key="gt06.port">5023</entry>
-    
+
+    <!-- TR20 server configuration -->
+    <entry key="tr20.enable">true</entry>
+    <entry key="tr20.port">5018</entry>
+
+    <!-- Navis server configuration -->
+    <entry key="navis.enable">true</entry>
+    <entry key="navis.port">5019</entry>
+
+    <!-- Meitrack server configuration -->
+    <entry key="meitrack.enable">true</entry>
+    <entry key="meitrack.port">5020</entry>
+
+    <!-- Skypatrol server configuration -->
+    <entry key="skypatrol.enable">true</entry>
+    <entry key="skypatrol.port">5021</entry>
+
+    <!-- GT02 server configuration -->
+    <entry key="gt02.enable">true</entry>
+    <entry key="gt02.port">5022</entry>
+
+    <!-- GT06 server configuration -->
+    <entry key="gt06.enable">true</entry>
+    <entry key="gt06.port">5023</entry>
+
 </properties>