From 17ff0791718807be18e9f63aa095ed86d4b82b1c Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 18 Aug 2015 13:22:16 +1200
Subject: Re-factor server side classes

---
 debug.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'debug.xml')

diff --git a/debug.xml b/debug.xml
index 25f2cc320..ceee553ce 100644
--- a/debug.xml
+++ b/debug.xml
@@ -18,15 +18,15 @@
     <entry key='geocoder.type'>nominatim</entry>
     <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
 
+    <entry key='distance.enable'>true</entry>
+
     <!--<entry key='filter.enable'>true</entry>
     <entry key='filter.limit'>3600</entry>
     <entry key='filter.invalid'>true</entry>
     <entry key='filter.zero'>true</entry>
     <entry key='filter.duplicate'>true</entry>
     <entry key='filter.distance'>50</entry>-->
-    
-    <entry key='system.odometer.enable'>true</entry>
-    
+
     <!--<entry key='forward.enable'>true</entry>
     <entry key='forward.url'>http://example.com:8080/gprmc/Data?id={uniqueId}&amp;code=0x0000&amp;gprmc={gprmc}</entry>-->
 
@@ -99,7 +99,6 @@
         altitude FLOAT NOT NULL,
         speed FLOAT NOT NULL,
         course FLOAT NOT NULL,
-        odometer FLOAT NOT NULL,
         address VARCHAR(512),
         other VARCHAR(4096) NOT NULL,
         FOREIGN KEY (deviceId) REFERENCES device (id) ON DELETE CASCADE);
@@ -235,8 +234,8 @@
     </entry>
 
     <entry key='database.insertPosition'>
-        INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, odometer, address, other)
-        VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :odometer, :address, :other);
+        INSERT INTO position (deviceId, protocol, serverTime, deviceTime, fixTime, valid, latitude, longitude, altitude, speed, course, address, other)
+        VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :address, :other);
     </entry>
 
     <entry key='database.selectLatestPositions'>
-- 
cgit v1.2.3