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

---
 src/org/traccar/BasePipelineFactory.java | 10 +++++++
 src/org/traccar/ODOMeterHandler.java     | 51 ++++++++++++++++++++++++++++++++
 src/org/traccar/model/Position.java      |  4 +++
 3 files changed, 65 insertions(+)
 create mode 100644 src/org/traccar/ODOMeterHandler.java

(limited to 'src/org')

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 4d8b0ffc4..410b57318 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -38,6 +38,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
     private int resetDelay;
 
     private FilterHandler filterHandler;
+    private ODOMeterHandler odoMeterHandler;
     private ReverseGeocoderHandler reverseGeocoderHandler;
 
     protected class OpenChannelHandler extends SimpleChannelHandler {
@@ -92,6 +93,10 @@ 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"));
@@ -114,6 +119,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (filterHandler != null) {
             pipeline.addLast("filter", filterHandler);
         }
+        
+        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
new file mode 100644
index 000000000..1dc3aed44
--- /dev/null
+++ b/src/org/traccar/ODOMeterHandler.java
@@ -0,0 +1,51 @@
+/**
+ * 
+ */
+package org.traccar;
+
+import org.traccar.helper.DistanceCalculator;
+import org.traccar.helper.Log;
+import org.traccar.model.Position;
+
+/**
+ * <p>
+ *  ODO Meter handler
+ * </p>
+ * 
+ * @author Amila Silva
+ *
+ */
+public class ODOMeterHandler extends BaseDataHandler {
+
+	public ODOMeterHandler() {
+		Log.debug("System based ODO meter calculation enabled for all devices");
+	}
+
+	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.info("::: Device Course : " + position.getDeviceId()
+					+ ", Distance :" + distance + "m, ODO Meter :" + odoMeter + " m");
+			position.setOdoMeter(odoMeter);
+		} 
+		return 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 62c999d94..8c3340d9c 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -56,6 +56,10 @@ public class Position extends Event implements Factory {
     private double course;
     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 String address;
     public String getAddress() { return address; }
-- 
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 'src/org')

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 59ecfcde5eabd14595c76e8595a9ee9193300d62 Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Fri, 14 Aug 2015 09:17:24 +0800
Subject: Rename odometer to one word

---
 src/org/traccar/ODOMeterHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/org')

diff --git a/src/org/traccar/ODOMeterHandler.java b/src/org/traccar/ODOMeterHandler.java
index 87dde6b92..781dd274d 100644
--- a/src/org/traccar/ODOMeterHandler.java
+++ b/src/org/traccar/ODOMeterHandler.java
@@ -9,7 +9,7 @@ import org.traccar.model.Position;
 
 /**
  * <p>
- *  ODO Meter handler
+ *  Odometer handler
  * </p>
  * 
  * @author Amila Silva
@@ -18,7 +18,7 @@ import org.traccar.model.Position;
 public class ODOMeterHandler extends BaseDataHandler {
 
 	public ODOMeterHandler() {
-		Log.debug("System based ODO meter calculation enabled for all devices");
+		Log.debug("System based odometer calculation enabled for all devices");
 	}
 
 	private Position getLastPosition(long deviceId) {
-- 
cgit v1.2.3


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

---
 src/org/traccar/ODOMeterHandler.java | 52 ------------------------------------
 src/org/traccar/OdometerHandler.java | 52 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 src/org/traccar/ODOMeterHandler.java
 create mode 100644 src/org/traccar/OdometerHandler.java

(limited to 'src/org')

diff --git a/src/org/traccar/ODOMeterHandler.java b/src/org/traccar/ODOMeterHandler.java
deleted file mode 100644
index 781dd274d..000000000
--- a/src/org/traccar/ODOMeterHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 
- */
-package org.traccar;
-
-import org.traccar.helper.DistanceCalculator;
-import org.traccar.helper.Log;
-import org.traccar.model.Position;
-
-/**
- * <p>
- *  Odometer handler
- * </p>
- * 
- * @author Amila Silva
- *
- */
-public class ODOMeterHandler extends BaseDataHandler {
-
-	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 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;
-	}
-
-	@Override
-	protected Position handlePosition(Position position) {
-		return calculateDistance(position);
-	}
-
-}
diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java
new file mode 100644
index 000000000..781dd274d
--- /dev/null
+++ b/src/org/traccar/OdometerHandler.java
@@ -0,0 +1,52 @@
+/**
+ * 
+ */
+package org.traccar;
+
+import org.traccar.helper.DistanceCalculator;
+import org.traccar.helper.Log;
+import org.traccar.model.Position;
+
+/**
+ * <p>
+ *  Odometer handler
+ * </p>
+ * 
+ * @author Amila Silva
+ *
+ */
+public class ODOMeterHandler extends BaseDataHandler {
+
+	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 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;
+	}
+
+	@Override
+	protected Position handlePosition(Position position) {
+		return calculateDistance(position);
+	}
+
+}
-- 
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 'src/org')

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 21ed9dbbd8c7be191894b11e895c1c0094b4aac6 Mon Sep 17 00:00:00 2001
From: amilasilva88 <amilasilva88@gmail.com>
Date: Sat, 15 Aug 2015 09:29:14 +0800
Subject: Set Odometer only if there is a movement

---
 src/org/traccar/OdometerHandler.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/org')

diff --git a/src/org/traccar/OdometerHandler.java b/src/org/traccar/OdometerHandler.java
index 5a813fc3a..d5860c02e 100644
--- a/src/org/traccar/OdometerHandler.java
+++ b/src/org/traccar/OdometerHandler.java
@@ -31,11 +31,17 @@ public class OdometerHandler extends BaseDataHandler {
     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();
+            // set odometer only on movement
+            double odometer = 0.0;
+            if (last.getSpeed() == 0 && position.getSpeed() == 0) {
+                odometer = last.getOdometer();
+            } else {
+                double distance = DistanceCalculator.distance(
+                        position.getLatitude(), position.getLongitude(),
+                        last.getLatitude(), last.getLongitude());
+                distance = Math.round((distance) * 100.0) / 100.0;
+                odometer = distance + last.getOdometer();
+            }
             position.setOdometer(odometer);
         }
         return position;
-- 
cgit v1.2.3