fleetmap-reports 2.0.376 → 2.0.377

package/package.json

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

package/src/util/trips.js

@@ -133,6 +133,9 @@ function isInsideTimetable (t, userData) {
 function updateTrip (device, t, route) {
   route = route.filter(p => p && p.attributes.ignition)
   if (!route.length) { return }
+  const originalDistance = t.distance
+  const originalDuration = t.duration
+  const originalSpentFuel = t.spentFuel
   const distance = calculateDistance(route, device ? device.attributes['report.ignoreOdometer'] : true) * 1000
   t.distance = distance
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
@@ -140,6 +143,13 @@ function updateTrip (device, t, route) {
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
   t.startOdometer = device && !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
   t.endOdometer = device && !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
+  if (originalSpentFuel > 0) {
+    // A trip clipped at a report day boundary keeps only part of its route, so its
+    // share of the trip's total fuel must be prorated too, otherwise the full trip's
+    // fuel gets counted on both days it was split across.
+    const ratio = originalDistance > 0 ? distance / originalDistance : (originalDuration > 0 ? t.duration / originalDuration : 1)
+    t.spentFuel = originalSpentFuel * Math.min(Math.max(ratio, 0), 1)
+  }
 }
 
 function getUncompletedTrip (device, deviceRoute, deviceTrips) {