From 2398c48dea487080b0b88872387c6ebfb6b37a07 Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sat, 4 Oct 2014 23:23:11 -0400
Subject: Fixed typo

---
 default.cfg               | 2 +-
 opengts.cfg               | 2 +-
 setup/linux/traccar.cfg   | 2 +-
 setup/macosx/traccar.cfg  | 2 +-
 setup/windows/traccar.cfg | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/default.cfg b/default.cfg
index 7e64b0216..4476309e5 100644
--- a/default.cfg
+++ b/default.cfg
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <!-- Global confiduration -->
+    <!-- Global configuration -->
     <!--<entry key='database.driverFile'>/home/user/Documents/traccar/hsqldb.jar</entry>-->
     <entry key='database.driver'>org.h2.Driver</entry>
     <entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
diff --git a/opengts.cfg b/opengts.cfg
index 16deb38ec..b490d9021 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <!-- Global confiduration -->
+    <!-- Global configuration -->
     <entry key='database.driver'>com.mysql.jdbc.Driver</entry>
     <entry key='database.url'>jdbc:mysql://localhost:3306/[DATABASE]?allowMultiQueries=true</entry>
     <entry key='database.user'>[USER]</entry>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index 52c99b315..df1b927a6 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <!-- Global confiduration -->
+    <!-- Global configuration -->
     <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>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index 52c99b315..df1b927a6 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <!-- Global confiduration -->
+    <!-- Global configuration -->
     <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>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 879f3e438..3abe786ea 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -4,7 +4,7 @@
 
 <properties>
 
-    <!-- Global confiduration -->
+    <!-- Global configuration -->
     <entry key='database.driver'>org.h2.Driver</entry>
     <entry key='database.dataSource'>org.h2.jdbcx.JdbcDataSource</entry>
     <entry key='database.url'>jdbc:h2:[DATABASE]</entry>
-- 
cgit v1.2.3


From 562deb3df7a17e1ed5607bffad86a932f6c45091 Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sat, 4 Oct 2014 23:39:08 -0400
Subject: Cleaned up some commented out properties

---
 default.cfg | 2 --
 opengts.cfg | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/default.cfg b/default.cfg
index 4476309e5..e33b831d0 100644
--- a/default.cfg
+++ b/default.cfg
@@ -71,7 +71,6 @@
 
     <!-- Xexun server configuration -->
     <entry key='xexun.enable'>true</entry>
-    <!--<entry key='xexun.address'>localhost</entry>-->
     <entry key='xexun.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
@@ -109,7 +108,6 @@
     <!-- Meiligao server configuration -->
     <entry key='meiligao.enable'>true</entry>
     <entry key='meiligao.port'>5009</entry>
-    <!--<entry key='meiligao.server'>127.0.0.1:5009</entry>-->
 
     <!-- Maxon server configuration -->
     <entry key='maxon.enable'>true</entry>
diff --git a/opengts.cfg b/opengts.cfg
index b490d9021..409e344dd 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -27,7 +27,7 @@
         DO 0;
     </entry>
 
-    <!-- Web interface port -->
+    <!-- Web interface -->
     <entry key='http.enable'>false</entry>
 
     <!-- Geocoder options -->
@@ -38,7 +38,6 @@
 
     <!-- Xexun server configuration -->
     <entry key='xexun.enable'>true</entry>
-    <!--<entry key='xexun.address'>localhost</entry>-->
     <entry key='xexun.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
-- 
cgit v1.2.3


From 652fd90b69fc805ed9f13de857e7a038551b1e1a Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sat, 4 Oct 2014 23:44:50 -0400
Subject: Added missing server entries

---
 opengts.cfg | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/opengts.cfg b/opengts.cfg
index 409e344dd..3a4c41ef2 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -131,6 +131,7 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
+    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
@@ -316,4 +317,12 @@
     <entry key='visiontek.enable'>true</entry>
     <entry key='visiontek.port'>5069</entry>
 
+    <!-- Orion server configuration -->
+    <entry key='orion.enable'>true</entry>
+    <entry key='orion.port'>5070</entry>
+
+    <!-- Riti server configuration -->
+    <entry key='riti.enable'>true</entry>
+    <entry key='riti.port'>5071</entry>
+
 </properties>
-- 
cgit v1.2.3


From 6cc5e74c8c81dc0f6bfb634d837da35d6fe3fe4e Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sat, 4 Oct 2014 23:58:15 -0400
Subject: Removed redundant geocoder.type entry

---
 default.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/default.cfg b/default.cfg
index e33b831d0..7e2c9b375 100644
--- a/default.cfg
+++ b/default.cfg
@@ -55,8 +55,7 @@
     <entry key='geocoder.enable'>false</entry>
     <entry key='geocoder.type'>nominatim</entry>
     <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
-    <entry key='geocoder.type'>nominatim</entry>
-    
+
     <!-- Filtering options -->
     <!--<entry key='filter.enable'>true</entry>
     <entry key='filter.limit'>3600</entry>
-- 
cgit v1.2.3


From 12f0d69be09fdb86a106562b1c25143edad3b749 Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sun, 5 Oct 2014 00:00:56 -0400
Subject: Added (unused) Filtering options; Added geocoder.type for
 completeness

---
 opengts.cfg | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/opengts.cfg b/opengts.cfg
index 3a4c41ef2..6c71843f7 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -32,6 +32,15 @@
 
     <!-- Geocoder options -->
     <entry key='geocoder.enable'>true</entry>
+    <entry key='geocoder.type'>google</entry>
+
+    <!-- Filtering options -->
+    <!--<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>-->
 
     <!-- Logging options -->
     <entry key='logger.enable'>false</entry>
-- 
cgit v1.2.3


From 291347448cdb83eb5a7c188e5c08b87a0c2a7def Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sun, 5 Oct 2014 00:16:13 -0400
Subject: Sync'd setup traccar.cfg files with new default.cfg

---
 setup/linux/traccar.cfg   | 26 ++++++++++++++++++++++++--
 setup/macosx/traccar.cfg  | 26 ++++++++++++++++++++++++--
 setup/windows/traccar.cfg | 26 ++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index df1b927a6..e09e36a08 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -44,18 +44,31 @@
         UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
     </entry>
 
-    <!-- Web interface port -->
+    <!-- Web interface -->
     <entry key='http.enable'>true</entry>
+    <!--<entry key='http.address'></entry>-->
     <entry key='http.port'>8082</entry>
     <entry key='http.application'>/opt/traccar/traccar-web.war</entry>
 
+    <!-- Geocoder options -->
+    <entry key='geocoder.enable'>false</entry>
+    <entry key='geocoder.type'>nominatim</entry>
+    <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+    <!-- Filtering options -->
+    <!--<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>-->
+
     <!-- Logging options -->
     <entry key='logger.enable'>true</entry>
     <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
 
     <!-- Xexun server configuration -->
     <entry key='xexun.enable'>true</entry>
-    <!--<entry key='xexun.address'>localhost</entry>-->
     <entry key='xexun.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
@@ -149,6 +162,7 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
+    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
@@ -334,4 +348,12 @@
     <entry key='visiontek.enable'>true</entry>
     <entry key='visiontek.port'>5069</entry>
 
+    <!-- Orion server configuration -->
+    <entry key='orion.enable'>true</entry>
+    <entry key='orion.port'>5070</entry>
+
+    <!-- Riti server configuration -->
+    <entry key='riti.enable'>true</entry>
+    <entry key='riti.port'>5071</entry>
+
 </properties>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index df1b927a6..e09e36a08 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -44,18 +44,31 @@
         UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
     </entry>
 
-    <!-- Web interface port -->
+    <!-- Web interface -->
     <entry key='http.enable'>true</entry>
+    <!--<entry key='http.address'></entry>-->
     <entry key='http.port'>8082</entry>
     <entry key='http.application'>/opt/traccar/traccar-web.war</entry>
 
+    <!-- Geocoder options -->
+    <entry key='geocoder.enable'>false</entry>
+    <entry key='geocoder.type'>nominatim</entry>
+    <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+    <!-- Filtering options -->
+    <!--<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>-->
+
     <!-- Logging options -->
     <entry key='logger.enable'>true</entry>
     <entry key='logger.file'>/opt/traccar/logs/tracker-server.log</entry>
 
     <!-- Xexun server configuration -->
     <entry key='xexun.enable'>true</entry>
-    <!--<entry key='xexun.address'>localhost</entry>-->
     <entry key='xexun.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
@@ -149,6 +162,7 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
+    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
@@ -334,4 +348,12 @@
     <entry key='visiontek.enable'>true</entry>
     <entry key='visiontek.port'>5069</entry>
 
+    <!-- Orion server configuration -->
+    <entry key='orion.enable'>true</entry>
+    <entry key='orion.port'>5070</entry>
+
+    <!-- Riti server configuration -->
+    <entry key='riti.enable'>true</entry>
+    <entry key='riti.port'>5071</entry>
+
 </properties>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index 3abe786ea..e46d3e866 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -44,18 +44,31 @@
         UPDATE devices SET latestPosition_id = :id WHERE id = :device_id;
     </entry>
 
-    <!-- Web interface port -->
+    <!-- Web interface -->
     <entry key='http.enable'>true</entry>
+    <!--<entry key='http.address'></entry>-->
     <entry key='http.port'>8082</entry>
     <entry key='http.application'>[WAR]</entry>
 
+    <!-- Geocoder options -->
+    <entry key='geocoder.enable'>false</entry>
+    <entry key='geocoder.type'>nominatim</entry>
+    <entry key='geocoder.url'>http://nominatim.openstreetmap.org/reverse</entry>
+
+    <!-- Filtering options -->
+    <!--<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>-->
+
     <!-- Logging options -->
     <entry key='logger.enable'>true</entry>
     <entry key='logger.file'>[LOG]</entry>
 
     <!-- Xexun server configuration -->
     <entry key='xexun.enable'>true</entry>
-    <!--<entry key='xexun.address'>localhost</entry>-->
     <entry key='xexun.port'>5000</entry>
 
     <!-- Gps103 server configuration -->
@@ -149,6 +162,7 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
+    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
@@ -334,4 +348,12 @@
     <entry key='visiontek.enable'>true</entry>
     <entry key='visiontek.port'>5069</entry>
 
+    <!-- Orion server configuration -->
+    <entry key='orion.enable'>true</entry>
+    <entry key='orion.port'>5070</entry>
+
+    <!-- Riti server configuration -->
+    <entry key='riti.enable'>true</entry>
+    <entry key='riti.port'>5071</entry>
+
 </properties>
-- 
cgit v1.2.3


From b186e95953f7af67ce17958cdb666044b57b78d9 Mon Sep 17 00:00:00 2001
From: jon-stumpf <jon.stumpf@gmail.com>
Date: Sun, 5 Oct 2014 21:48:38 -0400
Subject: Removed gt06.timezone setting in config files

---
 default.cfg               | 1 -
 opengts.cfg               | 1 -
 setup/linux/traccar.cfg   | 1 -
 setup/macosx/traccar.cfg  | 1 -
 setup/windows/traccar.cfg | 1 -
 5 files changed, 5 deletions(-)

diff --git a/default.cfg b/default.cfg
index 7e2c9b375..a684f7631 100644
--- a/default.cfg
+++ b/default.cfg
@@ -163,7 +163,6 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
-    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
diff --git a/opengts.cfg b/opengts.cfg
index 6c71843f7..6d632edd4 100644
--- a/opengts.cfg
+++ b/opengts.cfg
@@ -140,7 +140,6 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
-    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
diff --git a/setup/linux/traccar.cfg b/setup/linux/traccar.cfg
index e09e36a08..74bb6a97f 100644
--- a/setup/linux/traccar.cfg
+++ b/setup/linux/traccar.cfg
@@ -162,7 +162,6 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
-    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
diff --git a/setup/macosx/traccar.cfg b/setup/macosx/traccar.cfg
index e09e36a08..74bb6a97f 100644
--- a/setup/macosx/traccar.cfg
+++ b/setup/macosx/traccar.cfg
@@ -162,7 +162,6 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
-    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
diff --git a/setup/windows/traccar.cfg b/setup/windows/traccar.cfg
index e46d3e866..781592f9e 100644
--- a/setup/windows/traccar.cfg
+++ b/setup/windows/traccar.cfg
@@ -162,7 +162,6 @@
     <!-- GT06 server configuration -->
     <entry key='gt06.enable'>true</entry>
     <entry key='gt06.port'>5023</entry>
-    <entry key='gt06.timezone'>7200</entry>
 
     <!-- Megastek server configuration -->
     <entry key='megastek.enable'>true</entry>
-- 
cgit v1.2.3