fleetmap-reports 2.0.109 → 2.0.111

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -98,10 +98,11 @@ function getDeviceData (allInOne, d) {
     deviceTrips.push(uncompletedTrip)
   }
 
-  if (deviceRoute.find(p => p.attributes.xpert)) {
+  if (deviceRoute.find(p => p.attributes.rawXpert)) {
     // Inofleet unit with xpert data
-    const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
-    const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    const xpertMessages = deviceRoute.map(p => p.attributes.rawXpert).filter(a => a)
+    const endTripData = getEndTripMessages(xpertMessages).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+    const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
 
     const drivingTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0
     const idleTime = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalTimeInIdle || 0) - (endTripData[0].totalTimeInIdle || 0) : 0
@@ -145,7 +146,7 @@ function getDeviceData (allInOne, d) {
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
     const drivingConsumption = calculateConsumption(d, { trips: deviceTrips, stops: [], route: deviceRoute, summary: deviceSummary }, undefined)
     const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
-    const idleTime = deviceTrips.reduce((a, b) => a + b.idleTime, 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
+    const idleTime = deviceTrips.reduce((a, b) => a + (b.idleTime ? b.idleTime : 0), 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
     const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0
 
     const highEngineRPMSections = calculateRPMSections(deviceRoute, d.attributes.highRPM || 1300)

package/src/trip-report.js

@@ -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)
       })
 
@@ -311,6 +311,11 @@ async function processDrivers (from, to, userData, data) {
   return driversResult
 }
 
+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
+}
+
 async function exportTripReportToPDF (userData, reportData) {
   console.log('exportTripReportToPDF')
 

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())

package/src/util/xpert.js

@@ -44,18 +44,12 @@ function parseCanDriverStyleMessage (xpertMessage) {
   }
 }
 
-function getEndTripMessages (route) {
-  const positions = route.filter(p => p.attributes.xpert &&
-        (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
-
-  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '3') : p.attributes.xpert.split(';').find(m => m.startsWith('3'))))
+function getEndTripMessages (xpertMessages) {
+  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '3') : xpert.split(';').find(m => m.startsWith('3')))).filter(a => a)
 }
 
-function getCanDriverStyleMessages (route) {
-  const positions = route.filter(p => p.attributes.xpert &&
-      (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
-
-  return positions.map(p => (Array.isArray(p.attributes.xpert) ? p.attributes.xpert.find(x => x.type === '4') : p.attributes.xpert.split(';').find(m => m.startsWith('4'))))
+function getCanDriverStyleMessages (xpertMessages) {
+  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '4') : xpert.split(';').find(m => m.startsWith('4')))).filter(a => a)
 }
 
 exports.parseEndTripMessage = parseEndTripMessage