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

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

2 files changed, 22 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());
 
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index b408dbbf2..e6ac46de1 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.model;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -56,6 +57,12 @@ public class Position {
     public Date getTime() {
         return time;
     }
+    
+    public String getTimeFormated(){
+    	SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+		df.setLenient(false);
+    	return df.format(time);
+    }
 
     public void setTime(Date time) {
         this.time = time;
@@ -151,6 +158,18 @@ public class Position {
     public void setPower(Double power) {
         this.power = power;
     }
+    /**
+     * Mode / 1 - Parking | 2 - Driving
+     */
+    private int mode;
+
+    public int getMode() {
+        return mode;
+    }
+
+    public void setMode(int mode) {
+        this.mode = mode;
+    }
 
     /**
      * Address