fleetmap-reports 2.0.110 → 2.0.112

package/package.json

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

package/src/trip-report.js

@@ -12,7 +12,7 @@ const traccarHelper = require('./util/traccar')
 const trips = require('./util/trips')
 const {
   isInsideTimetable, isPartialInsideTimetable, getTripIdleTime, calculateStopDuration,
-  getUncompletedTrip
+  getUncompletedTrip, getTripTotalKms
 } = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
@@ -175,7 +175,9 @@ async function processDevices (from, to, devices, data, userData, traccar) {
     const stops = data.stops.filter(s => s.deviceId === d.id)
 
     trips.forEach(trip => {
-      trip.totalKms = trip.distance / 1000
+      const stop = getStop(new Date(trip.startTime), stops)
+
+      trip.totalKms = getTripTotalKms(trip, stop)
 
       const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
       if (nearestPOIs.length > 0) {
@@ -213,8 +215,6 @@ async function processDevices (from, to, devices, data, userData, traccar) {
           : 0
       }
 
-      const stop = getStop(new Date(trip.startTime), stops)
-
       if (deviceRoute.some(r => r.attributes.fuel) ||
           automaticReports.deviceWithFuelInfo(d)) {
         trip.fuelConsumption = calculateConsumption(d, { trips: [trip], stops: (stop ? [stop] : []), route: deviceRoute })
@@ -284,15 +284,15 @@ async function processDrivers (from, to, userData, data) {
 
     if (trips) {
       trips.forEach(trip => {
-        trip.totalKms = trip.distance / 1000
+        const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
+
+        trip.totalKms = getTripTotalKms(trip, stop)
 
         const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
         if (nearestPOIs.length > 0) {
           trip.endPOIName = nearestPOIs[0].p.name
         }
 
-        const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
-
         trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
       })
 

package/src/util/trips.js

@@ -10,7 +10,7 @@ function checkTripsKms (traccarInstance, from, to, devices, data) {
   if (trips.length > 0) {
     // Vehicles with imported positions. calculate trip distance with route positions
     trips.forEach(t => {
-      if (t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
+      if (t.distance === minDistance && t.averageSpeed > minAvgSpeed && data.route.find(p => p.source === 'import')) {
         const tripRoute = data.route.filter(p => p.deviceId === t.deviceId &&
                     new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime() &&
                     new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
@@ -217,6 +217,11 @@ function calculateStopDuration (stop) {
   return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
 }
 
+function getTripTotalKms (trip, stop) {
+  // 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
+  return (trip.distance + (stop ? (stop.endOdometer - stop.startOdometer) : 0)) / 1000
+}
+
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
@@ -227,3 +232,4 @@ exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration
 exports.getUncompletedTrip = getUncompletedTrip
+exports.getTripTotalKms = getTripTotalKms