fleetmap-reports 2.0.115 → 2.0.117

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.115",
+  "version": "2.0.117",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/util/trips.js

@@ -188,10 +188,31 @@ function calculateStopDuration (stop) {
   return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
 }
 
+const maxDistanceDiff = 10000
+
+function shouldRecalculate (trip, route) {
+  if (route && route.length) {
+    if (!trip.distance) {
+      return true
+    }
+    if (route[0].protocol === 'osmand' && route[0].attributes.odometer) {
+      const positions = route.filter(p => p.deviceId === trip.deviceId &&
+        new Date(p.fixTime).getTime() >= new Date(trip.startTime).getTime() &&
+        new Date(p.fixTime).getTime() <= new Date(trip.endTime).getTime())
+      if (positions.length) {
+        const totalDistance = positions[positions.length - 1].attributes.totalDistance - positions[0].attributes.totalDistance
+        return trip.distance < (totalDistance - maxDistanceDiff)
+      }
+    }
+  }
+  return false
+}
+
 function getTripTotalKms (trip, stop, route) {
   // we need to add stop kms to ensure that the total kms for the day, calculated with the odometer difference, will be equal to the sum of kms of all trips
   let distance = trip.distance + (stop ? (stop.endOdometer - stop.startOdometer) : 0)
-  if (!distance && route && route.length) {
+  if (shouldRecalculate(trip, route)) {
+    distance = 0
     const positions = route.filter(p => p.deviceId === trip.deviceId &&
       new Date(p.fixTime).getTime() >= new Date(trip.startTime).getTime() &&
       new Date(p.fixTime).getTime() <= new Date(trip.endTime).getTime())