From 0350d762a7c08199e79dc401b6c6821d7e2a21bd Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Thu, 13 Aug 2015 20:28:58 +0800
Subject: Added ODOMeter and Modification to Mobile UI

---
 web/app/store/DistanceUnits.js        | 22 +++++++++++++++++++++-
 web/app/store/SpeedUnits.js           |  6 ++++--
 web/app/view/main/MainMobile.js       |  5 +++++
 web/app/view/report/Report.js         |  9 ++++++++-
 web/app/view/state/StateController.js | 13 ++++++++++++-
 5 files changed, 50 insertions(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 506f1077c..7f0f93b70 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -20,5 +20,25 @@ Ext.define('Traccar.store.DistanceUnits', {
     data: [
         {'key': 'km', 'name': strings.sharedKm},
         {'key': 'mi', 'name': strings.sharedMi}
-    ]
+    ],
+    
+    convert: function(value, unit) {
+        switch (unit) {
+            case 'km':
+            	value = value * 0.001;
+                return Math.round(value * 100) / 100;
+            case 'mi':
+            	value = value * 0.000621371;
+                return Math.round(value * 100) / 100;
+        }
+        return value;
+    },
+    
+    getUnitName: function(unit) {
+        if (unit) {
+            return this.findRecord('key', unit).get('name');
+        } else {
+            return '';
+        }
+    },
 });
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index 78686fbb9..934d03717 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -25,9 +25,11 @@ Ext.define('Traccar.store.SpeedUnits', {
     convert: function(value, unit) {
         switch (unit) {
             case 'kmh':
-                return value * 1.852;
+            	value = value * 1.852; 
+                return Math.round(value * 10) / 10;
             case 'mph':
-                return value * 1.15078;
+            	value = value *  1.15078; 
+                return Math.round(value * 10) / 10;
         }
         return value;
     },
diff --git a/web/app/view/main/MainMobile.js b/web/app/view/main/MainMobile.js
index f32ad9fb1..1cdd6f525 100644
--- a/web/app/view/main/MainMobile.js
+++ b/web/app/view/main/MainMobile.js
@@ -40,6 +40,11 @@ Ext.define('Traccar.view.main.MainMobile', {
         xtype: 'deviceView',
         header: false,
         flex: 1
+    },{
+         region: 'east',
+         xtype: 'stateView',
+         header: false,
+         flex: 1
     }]
 
 });
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index ff8cc7b3d..f081333d4 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -90,7 +90,14 @@ Ext.define('Traccar.view.report.Report', {
                 return speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
             }
         },
-        { text: strings.positionCourse, dataIndex: 'course', flex: 1 },
+        /* { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, */
+        { text: 'ODO Meter', dataIndex: 'odoMeter', flex: 1,
+        	renderer: function(value) {
+                var distanceUnits = Ext.getStore('DistanceUnits');
+                var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
+                return distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
+            }	
+        },
         { text: strings.positionAddress, dataIndex: 'address', flex: 1 }
     ]
 
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 58b63120b..858feab52 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -59,9 +59,13 @@ Ext.define('Traccar.view.state.StateController', {
             priority: 6,
             name: strings.positionSpeed
         },
-        'course': {
+/*        'course': {
             priority: 7,
             name: strings.positionCourse
+        },*/
+        'odoMeter': {
+            priority: 7,
+            name: 'ODO Meter'
         },
         'address': {
             priority: 8,
@@ -87,6 +91,13 @@ Ext.define('Traccar.view.state.StateController', {
                     var unit = Traccar.getApplication().getUser().get('speedUnit') || Traccar.getApplication().getServer().get('speedUnit') || '';
                     value = speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
                 }
+                
+                if (key === 'odoMeter') {
+               	    var distanceUnits = Ext.getStore('DistanceUnits');
+                    var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
+                    value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
+                }
+                
                 store.add(Ext.create('Traccar.model.Parameter', {
                     priority: this.keys[key].priority,
                     name: this.keys[key].name,
-- 
cgit v1.2.3


From bb18dcd541642aad00ad3253940dc239a7c9681e Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Thu, 13 Aug 2015 22:13:18 +0800
Subject: my branding

---
 web/release.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/release.html b/web/release.html
index bc4d902c0..fc2ff6e87 100644
--- a/web/release.html
+++ b/web/release.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<title>Traccar</title>
+<title>BlueSky</title>
 <style>
 .state-indicator { position: absolute; top: -999em; left: -999em; z-index: 0; }
 @media all and (max-device-width: 768px) { .state-indicator { z-index: 1; } }
@@ -15,9 +15,10 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/theme-neptune.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol.min.js"></script>
 <script src="locale.js"></script>
-<script type="text/javascript">Ext.Loader.loadScript('app.min.js');</script>
+<!-- <script type="text/javascript">Ext.Loader.loadScript('app.min.js');</script> -->
+<script src="app.js"></script>
 </head>
 <body>
-<div style="position: fixed; bottom: 10px; right: 15px; font-size: x-small;">Powered by <a href="https://www.traccar.org/">Traccar GPS Tracking System</a></div>
+<div style="position: fixed; bottom: 10px; right: 15px; font-size: x-small;">Powered by <a href="https://www.mungingLabs.com/">BlueSky GPS Tracking System</a></div>
 </body>
 </html>
-- 
cgit v1.2.3


From 064cbff8e9f581bbd57988e5dd78a1f7e5480880 Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Fri, 14 Aug 2015 09:00:58 +0800
Subject: Resolved the review comments

---
 src/org/traccar/ODOMeterHandler.java  | 7 ++++---
 web/app/view/report/Report.js         | 2 +-
 web/app/view/state/StateController.js | 2 +-
 web/release.html                      | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'web')

diff --git a/src/org/traccar/ODOMeterHandler.java b/src/org/traccar/ODOMeterHandler.java
index 1dc3aed44..87dde6b92 100644
--- a/src/org/traccar/ODOMeterHandler.java
+++ b/src/org/traccar/ODOMeterHandler.java
@@ -36,10 +36,11 @@ public class ODOMeterHandler extends BaseDataHandler {
 					last.getLatitude(), last.getLongitude());
 			distance = Math.round((distance) * 100.0) / 100.0;
 			double odoMeter = distance + last.getOdoMeter();
-			Log.info("::: Device Course : " + position.getDeviceId()
-					+ ", Distance :" + distance + "m, ODO Meter :" + odoMeter + " m");
+//			Log.debug("::: Device Course : " + position.getDeviceId()
+//					+ ", Distance :" + distance + "m, Odometer :" + odoMeter
+//					+ " m");
 			position.setOdoMeter(odoMeter);
-		} 
+		}
 		return position;
 	}
 
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index f081333d4..6c43b9463 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -91,7 +91,7 @@ Ext.define('Traccar.view.report.Report', {
             }
         },
         /* { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, */
-        { text: 'ODO Meter', dataIndex: 'odoMeter', flex: 1,
+        { text: 'Odometer', dataIndex: 'odoMeter', flex: 1,
         	renderer: function(value) {
                 var distanceUnits = Ext.getStore('DistanceUnits');
                 var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 858feab52..6f222f6a8 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -65,7 +65,7 @@ Ext.define('Traccar.view.state.StateController', {
         },*/
         'odoMeter': {
             priority: 7,
-            name: 'ODO Meter'
+            name: 'Odometer'
         },
         'address': {
             priority: 8,
diff --git a/web/release.html b/web/release.html
index fc2ff6e87..2a4df7537 100644
--- a/web/release.html
+++ b/web/release.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<title>BlueSky</title>
+<title>Traccar</title>
 <style>
 .state-indicator { position: absolute; top: -999em; left: -999em; z-index: 0; }
 @media all and (max-device-width: 768px) { .state-indicator { z-index: 1; } }
@@ -19,6 +19,6 @@
 <script src="app.js"></script>
 </head>
 <body>
-<div style="position: fixed; bottom: 10px; right: 15px; font-size: x-small;">Powered by <a href="https://www.mungingLabs.com/">BlueSky GPS Tracking System</a></div>
+<div style="position: fixed; bottom: 10px; right: 15px; font-size: x-small;">Powered by <a href="https://www.traccar.org/">Traccar GPS Tracking System</a></div>
 </body>
 </html>
-- 
cgit v1.2.3


From 581a37587a4c015d241e179f0213cb889f4cce4b Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Fri, 14 Aug 2015 09:04:50 +0800
Subject: Reverted my local changes -  load from app.min.js instead of app.js

---
 web/release.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'web')

diff --git a/web/release.html b/web/release.html
index 2a4df7537..bc4d902c0 100644
--- a/web/release.html
+++ b/web/release.html
@@ -15,8 +15,7 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/theme-neptune/theme-neptune.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.7.0/ol.min.js"></script>
 <script src="locale.js"></script>
-<!-- <script type="text/javascript">Ext.Loader.loadScript('app.min.js');</script> -->
-<script src="app.js"></script>
+<script type="text/javascript">Ext.Loader.loadScript('app.min.js');</script>
 </head>
 <body>
 <div style="position: fixed; bottom: 10px; right: 15px; font-size: x-small;">Powered by <a href="https://www.traccar.org/">Traccar GPS Tracking System</a></div>
-- 
cgit v1.2.3


From a70f478740514e6e60ffbe49906a9c6150b2ec99 Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Fri, 14 Aug 2015 11:46:27 +0800
Subject: Refactoring - tabs to spaces and naming conventions

---
 debug.xml                                |  6 ++--
 src/org/traccar/BasePipelineFactory.java | 13 ++------
 src/org/traccar/OdometerHandler.java     | 57 +++++++++++++++-----------------
 src/org/traccar/model/Position.java      |  6 ++--
 web/app/view/report/Report.js            |  4 +--
 web/app/view/state/StateController.js    |  4 +--
 6 files changed, 40 insertions(+), 50 deletions(-)

(limited to 'web')

diff --git a/debug.xml b/debug.xml
index 2742356ca..25f2cc320 100644
--- a/debug.xml
+++ b/debug.xml
@@ -99,7 +99,7 @@
         altitude FLOAT NOT NULL,
         speed FLOAT NOT NULL,
         course FLOAT NOT NULL,
-        odoMeter 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 +235,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, odometer, address, other)
+        VALUES (:deviceId, :protocol, CURRENT_TIMESTAMP(), :time, :time, :valid, :latitude, :longitude, :altitude, :speed, :course, :odometer, :address, :other);
     </entry>
 
     <entry key='database.selectLatestPositions'>
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 410b57318..6c4a6b5bd 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -25,7 +25,6 @@ import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.logging.LoggingHandler;
@@ -38,7 +37,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private int resetDelay;
 
     private FilterHandler filterHandler;
-    private ODOMeterHandler odoMeterHandler;
+    private OdometerHandler odometerHandler;
     private ReverseGeocoderHandler reverseGeocoderHandler;
 
     protected class OpenChannelHandler extends SimpleChannelHandler {
@@ -93,10 +92,6 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
             filterHandler = new FilterHandler();
         }
         
-        if (Context.getConfig().getBoolean("system.odometer.enable")) {
-        	odoMeterHandler = new ODOMeterHandler();
-        }
-        
         if (Context.getReverseGeocoder() != null) {
             reverseGeocoderHandler = new ReverseGeocoderHandler(
                     Context.getReverseGeocoder(), Context.getConfig().getBoolean("geocode.processInvalidPositions"));
@@ -119,11 +114,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (filterHandler != null) {
             pipeline.addLast("filter", filterHandler);
         }
-        
-        if (odoMeterHandler != null) {
-            pipeline.addLast("odoMeter", odoMeterHandler);
+        if (odometerHandler != null) {
+            pipeline.addLast("odometer", odometerHandler);
         }
-        
         if (reverseGeocoderHandler != null) {
             pipeline.addLast("geocoder", reverseGeocoderHandler);
         }
diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java
index 781dd274d..5a813fc3a 100644
--- a/src/org/traccar/OdometerHandler.java
+++ b/src/org/traccar/OdometerHandler.java
@@ -9,44 +9,41 @@ import org.traccar.model.Position;
 
 /**
  * <p>
- *  Odometer handler
+ * Odometer - total mileage calculation handler
  * </p>
  * 
  * @author Amila Silva
  *
  */
-public class ODOMeterHandler extends BaseDataHandler {
+public class OdometerHandler extends BaseDataHandler {
 
-	public ODOMeterHandler() {
-		Log.debug("System based odometer calculation enabled for all devices");
-	}
+    public OdometerHandler() {
+        Log.debug("System based odometer calculation enabled for all devices");
+    }
 
-	private Position getLastPosition(long deviceId) {
-		if (Context.getConnectionManager() != null) {
-			return Context.getConnectionManager().getLastPosition(deviceId);
-		}
-		return null;
-	}
+    private Position getLastPosition(long deviceId) {
+        if (Context.getConnectionManager() != null) {
+            return Context.getConnectionManager().getLastPosition(deviceId);
+        }
+        return null;
+    }
 
-	private Position calculateDistance(Position position) {
-		Position last = getLastPosition(position.getDeviceId());
-		if (last != null) {
-			double distance = DistanceCalculator.distance(
-					position.getLatitude(), position.getLongitude(),
-					last.getLatitude(), last.getLongitude());
-			distance = Math.round((distance) * 100.0) / 100.0;
-			double odoMeter = distance + last.getOdoMeter();
-//			Log.debug("::: Device Course : " + position.getDeviceId()
-//					+ ", Distance :" + distance + "m, Odometer :" + odoMeter
-//					+ " m");
-			position.setOdoMeter(odoMeter);
-		}
-		return position;
-	}
+    private Position calculateDistance(Position position) {
+        Position last = getLastPosition(position.getDeviceId());
+        if (last != null) {
+            double distance = DistanceCalculator.distance(
+                    position.getLatitude(), position.getLongitude(),
+                    last.getLatitude(), last.getLongitude());
+            distance = Math.round((distance) * 100.0) / 100.0;
+            double odometer = distance + last.getOdometer();
+            position.setOdometer(odometer);
+        }
+        return position;
+    }
 
-	@Override
-	protected Position handlePosition(Position position) {
-		return calculateDistance(position);
-	}
+    @Override
+    protected Position handlePosition(Position position) {
+        return calculateDistance(position);
+    }
 
 }
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 8c3340d9c..0c928439c 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -57,9 +57,9 @@ public class Position extends Event implements Factory {
     public double getCourse() { return course; }
     public void setCourse(double course) { this.course = course; }
     
-    private double odoMeter; // value in meters
-    public double getOdoMeter() { return odoMeter; }
-    public void setOdoMeter(double odoMeter) { this.odoMeter = odoMeter; }
+    private double odometer; // value in meters
+    public double getOdometer() { return odometer; }
+    public void setOdometer(double odometer) { this.odometer = odometer; }
 
     private String address;
     public String getAddress() { return address; }
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index 6c43b9463..5466c7887 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -91,8 +91,8 @@ Ext.define('Traccar.view.report.Report', {
             }
         },
         /* { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, */
-        { text: 'Odometer', dataIndex: 'odoMeter', flex: 1,
-        	renderer: function(value) {
+        { text: 'Odometer', dataIndex: 'odometer', flex: 1,
+            renderer: function(value) {
                 var distanceUnits = Ext.getStore('DistanceUnits');
                 var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
                 return distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 6f222f6a8..685805418 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -63,7 +63,7 @@ Ext.define('Traccar.view.state.StateController', {
             priority: 7,
             name: strings.positionCourse
         },*/
-        'odoMeter': {
+        'odometer': {
             priority: 7,
             name: 'Odometer'
         },
@@ -92,7 +92,7 @@ Ext.define('Traccar.view.state.StateController', {
                     value = speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
                 }
                 
-                if (key === 'odoMeter') {
+                if (key === 'odometer') {
                	    var distanceUnits = Ext.getStore('DistanceUnits');
                     var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
                     value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
-- 
cgit v1.2.3


From 3ad3edfadba59e94d95e967e9d5cd28ae671cae4 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 18 Aug 2015 13:47:52 +1200
Subject: Re-factor web interface part

---
 web/app/store/DistanceUnits.js        |  8 +++-----
 web/app/store/SpeedUnits.js           |  6 ++----
 web/app/view/main/MainMobile.js       |  5 -----
 web/app/view/report/Report.js         |  8 --------
 web/app/view/state/StateController.js | 28 ++++++++++++++--------------
 5 files changed, 19 insertions(+), 36 deletions(-)

(limited to 'web')

diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 7f0f93b70..653bf6efb 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -25,11 +25,9 @@ Ext.define('Traccar.store.DistanceUnits', {
     convert: function(value, unit) {
         switch (unit) {
             case 'km':
-            	value = value * 0.001;
-                return Math.round(value * 100) / 100;
+                return Math.round(value * 0.1) / 100;
             case 'mi':
-            	value = value * 0.000621371;
-                return Math.round(value * 100) / 100;
+                return Math.round(value * 0.0621371) / 100;
         }
         return value;
     },
@@ -40,5 +38,5 @@ Ext.define('Traccar.store.DistanceUnits', {
         } else {
             return '';
         }
-    },
+    }
 });
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index 934d03717..15c52625f 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -25,11 +25,9 @@ Ext.define('Traccar.store.SpeedUnits', {
     convert: function(value, unit) {
         switch (unit) {
             case 'kmh':
-            	value = value * 1.852; 
-                return Math.round(value * 10) / 10;
+                return Math.round(value * 1.852 * 10) / 10;
             case 'mph':
-            	value = value *  1.15078; 
-                return Math.round(value * 10) / 10;
+                return Math.round(value * 1.15078 * 10) / 10;
         }
         return value;
     },
diff --git a/web/app/view/main/MainMobile.js b/web/app/view/main/MainMobile.js
index 1cdd6f525..f32ad9fb1 100644
--- a/web/app/view/main/MainMobile.js
+++ b/web/app/view/main/MainMobile.js
@@ -40,11 +40,6 @@ Ext.define('Traccar.view.main.MainMobile', {
         xtype: 'deviceView',
         header: false,
         flex: 1
-    },{
-         region: 'east',
-         xtype: 'stateView',
-         header: false,
-         flex: 1
     }]
 
 });
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index 5466c7887..535be942b 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -90,14 +90,6 @@ Ext.define('Traccar.view.report.Report', {
                 return speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
             }
         },
-        /* { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, */
-        { text: 'Odometer', dataIndex: 'odometer', flex: 1,
-            renderer: function(value) {
-                var distanceUnits = Ext.getStore('DistanceUnits');
-                var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
-                return distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
-            }	
-        },
         { text: strings.positionAddress, dataIndex: 'address', flex: 1 }
     ]
 
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 685805418..58bc5c55c 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -59,13 +59,9 @@ Ext.define('Traccar.view.state.StateController', {
             priority: 6,
             name: strings.positionSpeed
         },
-/*        'course': {
+        'course': {
             priority: 7,
             name: strings.positionCourse
-        },*/
-        'odometer': {
-            priority: 7,
-            name: 'Odometer'
         },
         'address': {
             priority: 8,
@@ -80,24 +76,20 @@ Ext.define('Traccar.view.state.StateController', {
     updatePosition: function(position) {
 
         var other;
+        var value;
+        var unit;
         var store = Ext.getStore('Parameters');
         store.removeAll();
 
         for (var key in position.data) {
             if (position.data.hasOwnProperty(key) && this.keys[key] !== undefined) {
-                var value = position.get(key);
+                value = position.get(key);
                 if (key === 'speed') {
                     var speedUnits = Ext.getStore('SpeedUnits');
-                    var unit = Traccar.getApplication().getUser().get('speedUnit') || Traccar.getApplication().getServer().get('speedUnit') || '';
+                    unit = Traccar.getApplication().getUser().get('speedUnit') || Traccar.getApplication().getServer().get('speedUnit') || '';
                     value = speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
                 }
                 
-                if (key === 'odometer') {
-               	    var distanceUnits = Ext.getStore('DistanceUnits');
-                    var unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
-                    value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
-                }
-                
                 store.add(Ext.create('Traccar.model.Parameter', {
                     priority: this.keys[key].priority,
                     name: this.keys[key].name,
@@ -114,12 +106,20 @@ Ext.define('Traccar.view.state.StateController', {
         }
         for (var key in other) {
             if (other.hasOwnProperty(key)) {
+
+                value = other[key];
+                if (key === 'distance' || key === 'odometer') {
+                    var distanceUnits = Ext.getStore('DistanceUnits');
+                    unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
+                    value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit);
+                }
+
                 store.add(Ext.create('Traccar.model.Parameter', {
                     priority: 999,
                     name: key.replace(/^./, function (match) {
                         return match.toUpperCase();
                     }),
-                    value: other[key]
+                    value: value
                 }));
             }
         }
-- 
cgit v1.2.3