Merge branch 'master' of https://github.com/williamchitto/traccar into williamchitto-master

Conflicts:
	pom.xml
	src/org/traccar/Server.java

1 files changed, 3 insertions, 0 deletions

diff --git a/src/org/traccar/model/DatabaseDataManager.java b/src/org/traccar/model/DatabaseDataManager.java
index 384d87828..3092744c0 100644
--- a/src/org/traccar/model/DatabaseDataManager.java
+++ b/src/org/traccar/model/DatabaseDataManager.java
@@ -210,6 +210,8 @@ public class DatabaseDataManager implements DataManager {
             position.setSpeed(result.getDouble("speed"));
             position.setCourse(result.getDouble("course"));
             position.setPower(result.getDouble("power"));
+            position.setMode(result.getInt("mode"));
+            position.setAddress(result.getString("address"));
             positionList.add(position);
         }
 
@@ -229,6 +231,7 @@ public class DatabaseDataManager implements DataManager {
         queryAddPosition.setDouble("speed", position.getSpeed());
         queryAddPosition.setDouble("course", position.getCourse());
         queryAddPosition.setDouble("power", position.getPower());
+        queryAddPosition.setInt("mode", position.getMode());
         queryAddPosition.setString("address", position.getAddress());
         queryAddPosition.setString("extended_info", position.getExtendedInfo());