Corrections of wrong "git fetch upstream"

1 files changed, 19 insertions, 0 deletions

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