fleetmap-reports 1.0.412 → 1.0.415

package/package.json

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

package/src/idle-report.js

@@ -6,6 +6,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
+const { getIdleEvents } = require('./util/route')
 
 const fileName = 'IdleReport'
 
@@ -41,7 +42,11 @@ async function createIdleReportByDriver (from, to, userData, traccarInstance) {
 
   const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
 
-  return { drivers: processDrivers(from, to, userData, route) }
+  return {
+    drivers: processDrivers(from, to, userData, route),
+    from,
+    to
+  }
 }
 
 async function createIdleReportByGroup (from, to, userData, traccarInstance) {
@@ -107,17 +112,21 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
 function processDrivers (from, to, userData, routes) {
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId || !p.attributes.ignition)
+    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId)
 
-    const idleEvents = getIdleEvents(route)
-    console.log(idleEvents)
     if (route.length > 0) {
+      const idleEvents = getIdleEvents(routes, d)
       const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
       if (filteredEvents.length) {
+        filteredEvents.forEach(e => {
+          const device = userData.devices.find(d => d.id === e.position.deviceId)
+          e.deviceName = device ? device.name : ''
+        })
+
         const driverData = {
           driver: d,
-          idleEvents: filteredEvents
+          idleEvents: filteredEvents.sort((a, b) => (new Date(a.position.fixTime) > new Date(b.position.fixTime)) ? 1 : -1)
         }
         driversResult.push(driverData)
       }
@@ -149,46 +158,6 @@ function processDevices (from, to, devices, routes, userData) {
   return devicesResult
 }
 
-function getIdleEvents (route) {
-  const idleEvents = []
-
-  const routeByDevice = route.reduce(function (a, x) {
-    (a[x.deviceId] = a[x.deviceId] || []).push(x)
-    return a
-  }, {})
-
-  Object.keys(routeByDevice).forEach(function (key) {
-    let inIdle = false
-    routeByDevice[key].forEach(p => {
-      if (p.attributes.ignition && p.speed === 0) {
-        if (!inIdle) {
-          const idleEvent = {
-            position: p,
-            idleTime: 0
-          }
-          idleEvents.push(idleEvent)
-          inIdle = true
-        } else {
-          if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
-            idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
-          }
-          if (p.attributes.idleTime) {
-            idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
-          }
-        }
-      } else if (inIdle) {
-        const currentIdleEvent = idleEvents[idleEvents.length - 1]
-        if (p.attributes.idleTime === undefined) {
-          currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
-        }
-        inIdle = false
-      }
-    })
-  })
-
-  return idleEvents
-}
-
 async function exportIdleReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 

package/src/index.test.js

@@ -208,8 +208,8 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const driver = data[0].drivers.find(d => d.driver.id === 14020)
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
-    assert.equal(driver.idleEvents.length, 12) // Total Alerts
-    assert.equal(totalIdleTime, 30785000) // Total Duration
+    assert.equal(driver.idleEvents.length, 1) // Total Alerts
+    assert.equal(totalIdleTime, 8267000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Activity by device', async () => {

package/src/trip-report.js

@@ -7,8 +7,9 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const traccarHelper = require('./util/traccar')
 const trips = require('./util/trips')
-const { isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
+const { isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
+const { getIdleEvents } = require('./util/route')
 
 const fileName = 'TripReport'
 
@@ -192,6 +193,13 @@ function processDrivers (from, to, userData, data) {
 
     trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
+    const idleEvents = getIdleEvents(data.route, d)
+
+    trips.forEach(function (trip, i) {
+      trip.stopEngineHours = getTripIdleTime(trip, idleEvents)
+      trip.stopDuration = i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : 0
+    })
+
     addNearestPOIs(trips, userData)
 
     if (trips.length > 0) {
@@ -229,7 +237,9 @@ async function exportTripReportToPDF (userData, reportData) {
   ]
 
   if (userData.byDriver) {
-    headers.push(translations.report.distance,
+    headers.push(translations.report.idleTime,
+      translations.report.stopTime,
+      translations.report.distance,
       translations.report.avgSpeed,
       translations.report.maxSpeed,
       translations.report.name)
@@ -276,7 +286,7 @@ async function exportTripReportToPDF (userData, reportData) {
         doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space + 35)
       }
 
-      d.trips.map(a => {
+      d.trips.forEach(a => {
         const temp = [
           getTripDate(userData.user, a),
           getTripStart(userData.user, a),
@@ -285,18 +295,16 @@ async function exportTripReportToPDF (userData, reportData) {
           convertMS(a.duration)
         ]
 
+        temp.push(convertMS(a.stopEngineHours),
+          convertMS(a.stopDuration),
+          Intl.NumberFormat(userData.user.attributes.lang, { maximumFractionDigits: 2 }).format(a.totalKms),
+          Math.round(a.averageSpeed * 1.85200),
+          Math.round(a.maxSpeed * 1.85200))
+
         if (userData.byDriver) {
-          temp.push(Intl.NumberFormat(userData.user.attributes.lang, { maximumFractionDigits: 2 }).format(a.totalKms),
-            Math.round(a.averageSpeed * 1.85200),
-            Math.round(a.maxSpeed * 1.85200),
-            a.deviceName)
+          temp.push(a.deviceName)
         } else {
-          temp.push(convertMS(a.stopEngineHours),
-            convertMS(a.stopDuration),
-            Intl.NumberFormat(userData.user.attributes.lang, { maximumFractionDigits: 2 }).format(a.totalKms),
-            Math.round(a.averageSpeed * 1.85200),
-            Math.round(a.maxSpeed * 1.85200),
-            getDriverName(userData.drivers, a.driverUniqueId))
+          temp.push(getDriverName(userData.drivers, a.driverUniqueId))
         }
 
         data.push(temp)
@@ -307,17 +315,11 @@ async function exportTripReportToPDF (userData, reportData) {
         convertMS(d.trips.reduce((a, b) => a + b.duration, 0))
       ]
 
-      if (userData.byDriver) {
-        footValues.push(getSumTotalKms(userData.user, d.trips),
-          getSumAvgSpeed(d.trips),
-          getMaxSpeed(d.trips))
-      } else {
-        footValues.push(convertMS(d.trips.reduce((a, b) => a + b.stopEngineHours, 0)),
-          convertMS(d.trips.reduce((a, b) => a + b.stopDuration, 0)),
-          getSumTotalKms(userData.user, d.trips),
-          getSumAvgSpeed(d.trips),
-          getMaxSpeed(d.trips))
-      }
+      footValues.push(convertMS(d.trips.reduce((a, b) => a + b.stopEngineHours, 0)),
+        convertMS(d.trips.reduce((a, b) => a + b.stopDuration, 0)),
+        getSumTotalKms(userData.user, d.trips),
+        getSumAvgSpeed(d.trips),
+        getMaxSpeed(d.trips))
 
       const style = getStyle(getUserPartner(userData.user))
       addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
@@ -345,6 +347,8 @@ function exportTripReportToExcel (userData, reportData) {
         { label: translations.report.end, value: 'end' },
         { label: translations.report.endAddress, value: 'endAddress' },
         { label: translations.report.tripTime, value: 'tripTime' },
+        { label: translations.report.idleTime, value: 'idleTime' },
+        { label: translations.report.stopTime, value: 'stopTime' },
         { label: translations.report.distance, value: 'distance' },
         { label: translations.report.avgSpeed, value: 'averageSpeed' },
         { label: translations.report.maxSpeed, value: 'maxSpeed' },

package/src/util/geofence.js

@@ -1,12 +1,13 @@
-const turf = require('turf')
+const turf = require('@turf/helpers')
+const inside = require('@turf/boolean-point-in-polygon')
 
-exports.insideGeofence = function insideGeofence(position, geofence) {
-    const coords = geofence.area.slice(9, geofence.area.length-2).split(',')
-    const coords2 = coords.map(c => {
-         return c.trim().split(' ').map(a => parseFloat(a))
-    })
-    var pt = turf.point([parseFloat(position.latitude), parseFloat(position.longitude)]);
-    var poly = turf.polygon([coords2]);
+exports.insideGeofence = function insideGeofence (position, geofence) {
+  const coords = geofence.area.slice(9, geofence.area.length - 2).split(',')
+  const coords2 = coords.map(c => {
+    return c.trim().split(' ').map(a => parseFloat(a))
+  })
+  const pt = turf.point([parseFloat(position.latitude), parseFloat(position.longitude)])
+  const poly = turf.polygon([coords2])
 
-    return turf.inside(pt, poly)
+  return inside.default(pt, poly)
 }

package/src/util/route.js

@@ -0,0 +1,42 @@
+function getIdleEvents (route, driver) {
+  const idleEvents = []
+
+  const routeByDevice = route.reduce(function (a, x) {
+    (a[x.deviceId] = a[x.deviceId] || []).push(x)
+    return a
+  }, {})
+
+  Object.keys(routeByDevice).forEach(function (key) {
+    let inIdle = false
+    routeByDevice[key].forEach(p => {
+      if (p.attributes.ignition && p.speed === 0 && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
+        if (!inIdle) {
+          const idleEvent = {
+            position: p,
+            idleTime: 0
+          }
+          idleEvents.push(idleEvent)
+          inIdle = true
+        } else {
+          if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
+            idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
+          }
+
+          if (p.attributes.idleTime) {
+            idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
+          }
+        }
+      } else if (inIdle) {
+        const currentIdleEvent = idleEvents[idleEvents.length - 1]
+        if (p.attributes.idleTime === undefined) {
+          currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
+        }
+        inIdle = false
+      }
+    })
+  })
+
+  return idleEvents
+}
+
+exports.getIdleEvents = getIdleEvents

package/src/util/trips.js

@@ -1,175 +1,178 @@
-const {coordsDistance, convertFromUTC, weekDaySelected} = require("./utils");
+const { coordsDistance, convertFromUTC, weekDaySelected } = require('./utils')
 
 const minDistance = 0
 const minAvgSpeed = 0
 
-function addNearestPOIs(trips, userData){
-    trips.forEach(t => {
-        t.totalKms = t.distance / 1000
-
-        const distance = userData.geofences
-            .filter(g => g && g.area.startsWith('CIRCLE'))
-            .map(g => {
-                const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
-                const coord = str.trim().split(' ')
-                return {
-                    p: g,
-                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
-                }
-            })
-        const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
-        if (nearestPOIs.length > 0) {
-            t.endPOIName = nearestPOIs[0].p.name
+function addNearestPOIs (trips, userData) {
+  trips.forEach(t => {
+    t.totalKms = t.distance / 1000
+
+    const distance = userData.geofences
+      .filter(g => g && g.area.startsWith('CIRCLE'))
+      .map(g => {
+        const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
+        const coord = str.trim().split(' ')
+        return {
+          p: g,
+          distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
         }
-    })
-}
-
-function checkTripsKms(traccarInstance, from, to, devices, data) {
-    console.log('checkTripsKms')
-    const trips = data.trips.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
-    if(trips.length > 0) {
-        //Vehicles with imported positions. calculate trip distance with route positions
-        trips.forEach(t => {
-            if(t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
-                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())
-
-                let current = null
-                const distances = []
-                for(const p of tripRoute) {
-                    if(current) {
-                        distances.push(coordsDistance(parseFloat(current.longitude),parseFloat(current.latitude),
-                            parseFloat(p.longitude),parseFloat(p.latitude)))
-                    }
-                    current = p
-                }
-
-                t.distance = distances.reduce((a, b) => a + b, 0)
-            }
-        })
+      })
+    const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
+    if (nearestPOIs.length > 0) {
+      t.endPOIName = nearestPOIs[0].p.name
     }
+  })
 }
 
-function isPartialInsideTimetable(t, userData, route){
-    const tripStart = new Date(t.startTime)
-    const tripEnd = new Date(t.endTime)
-
-    let isPartialInside = false
-
-    if(weekDaySelected(tripStart, userData.weekDays)) {
-
-        const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-        if(startDate.getTime() > endDate.getTime()){
-            //Trip starts outside time period and ends inside time period
-            if (tripStart.getTime() < endDate.getTime()
-                && tripEnd.getTime() > endDate.getTime()) {
-                //Trip starts inside time period and ends outside time period
-                const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-                updateTrip(t, routeInside)
-                t.endTime = endDate.toISOString()
-                t.endTimeIsOut = true
-                isPartialInside = true
-            }
-
-            if (tripStart.getTime() < startDate.getTime()
-                && new Date(t.endTime).getTime() > startDate.getTime()) {
-
-                //Trip starts outside time period and ends inside time period
-                const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-                updateTrip(t, routeInside)
-                t.startTime = startDate.toISOString()
-                t.startTimeIsOut = true
-                isPartialInside = true
-            }
-
-        } else {
-            if (tripStart.getTime() < startDate.getTime()
-                && tripEnd.getTime() > startDate.getTime()) {
-                //Trip starts outside time period and ends inside time period
-                const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-                updateTrip(t, routeInside)
-                t.startTime = startDate.toISOString()
-                t.startTimeIsOut = true
-                isPartialInside = true
-            }
-
-            if (tripStart.getTime() < endDate.getTime()
-                && tripEnd.getTime() > endDate.getTime()) {
-                //Trip starts inside time period and ends outside time period
-                const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-                updateTrip(t, routeInside)
-                t.endTime = endDate.toISOString()
-                t.endTimeIsOut = true
-                isPartialInside = true
-            }
+function checkTripsKms (traccarInstance, from, to, devices, data) {
+  console.log('checkTripsKms')
+  const trips = data.trips.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
+  if (trips.length > 0) {
+    // Vehicles with imported positions. calculate trip distance with route positions
+    trips.forEach(t => {
+      if (t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
+        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())
+
+        let current = null
+        const distances = []
+        for (const p of tripRoute) {
+          if (current) {
+            distances.push(coordsDistance(parseFloat(current.longitude), parseFloat(current.latitude),
+              parseFloat(p.longitude), parseFloat(p.latitude)))
+          }
+          current = p
         }
-    }
 
-    return isPartialInside
+        t.distance = distances.reduce((a, b) => a + b, 0)
+      }
+    })
+  }
 }
 
+function isPartialInsideTimetable (t, userData, route) {
+  const tripStart = new Date(t.startTime)
+  const tripEnd = new Date(t.endTime)
+
+  let isPartialInside = false
+
+  if (weekDaySelected(tripStart, userData.weekDays)) {
+    const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+
+    if (startDate.getTime() > endDate.getTime()) {
+      // Trip starts outside time period and ends inside time period
+      if (tripStart.getTime() < endDate.getTime() &&
+                tripEnd.getTime() > endDate.getTime()) {
+        // Trip starts inside time period and ends outside time period
+        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+        updateTrip(t, routeInside)
+        t.endTime = endDate.toISOString()
+        t.endTimeIsOut = true
+        isPartialInside = true
+      }
+
+      if (tripStart.getTime() < startDate.getTime() &&
+                new Date(t.endTime).getTime() > startDate.getTime()) {
+        // Trip starts outside time period and ends inside time period
+        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+        updateTrip(t, routeInside)
+        t.startTime = startDate.toISOString()
+        t.startTimeIsOut = true
+        isPartialInside = true
+      }
+    } else {
+      if (tripStart.getTime() < startDate.getTime() &&
+                tripEnd.getTime() > startDate.getTime()) {
+        // Trip starts outside time period and ends inside time period
+        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+        updateTrip(t, routeInside)
+        t.startTime = startDate.toISOString()
+        t.startTimeIsOut = true
+        isPartialInside = true
+      }
+
+      if (tripStart.getTime() < endDate.getTime() &&
+                tripEnd.getTime() > endDate.getTime()) {
+        // Trip starts inside time period and ends outside time period
+        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+        updateTrip(t, routeInside)
+        t.endTime = endDate.toISOString()
+        t.endTimeIsOut = true
+        isPartialInside = true
+      }
+    }
+  }
+
+  return isPartialInside
+}
 
-function isInsideTimetable(t, userData){
-    const tripStart = new Date(t.startTime)
-    const tripEnd = new Date(t.endTime)
+function isInsideTimetable (t, userData) {
+  const tripStart = new Date(t.startTime)
+  const tripEnd = new Date(t.endTime)
 
-    if(weekDaySelected(tripStart, userData.weekDays)) {
-        const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
+  if (weekDaySelected(tripStart, userData.weekDays)) {
+    const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
 
-        //Trips inside time period
-        if(startDate.getTime() < endDate.getTime()) {
-            console.log((tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()))
-            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-        } else {
-            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+    // Trips inside time period
+    if (startDate.getTime() < endDate.getTime()) {
+      console.log((tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()))
+      return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+    } else {
+      return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
                 (tripStart.getTime() > startDate.getTime())
-        }
     }
+  }
 
-    return false
+  return false
 }
 
-function updateTrip(t, route){
-    if (!route[route.length-1]) { return }
-    const distance = route[route.length-1].attributes.totalDistance - route[0].attributes.totalDistance
-    t.distance = distance
-    t.duration = new Date(route[route.length-1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
-    t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
-    t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
+function updateTrip (t, route) {
+  if (!route[route.length - 1]) { return }
+  const distance = route[route.length - 1].attributes.totalDistance - route[0].attributes.totalDistance
+  t.distance = distance
+  t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
+  t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
+  t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
 }
 
-function calculateTrip(device, route) {
-    const startPos = route[0]
-    const endPos = route[route.length-1]
-
-    return {
-        deviceId: device.id,
-        deviceName: device.name,
-        distance: route.reduce((a, b) => a + b.attributes.distance, 0),
-        averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
-        maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
-        spentFuel: 0,
-        startOdometer: startPos.attributes.odometer || startPos.attributes.totalDistance,
-        endOdometer: endPos.attributes.odometer || endPos.attributes.totalDistance,
-        startPositionId: startPos.id,
-        endPositionId: endPos.id,
-        startLat: startPos.latitude,
-        startLon: startPos.longitude,
-        startTime: startPos.fixTime,
-        startAddress: startPos.address,
-        endLat: endPos.latitude,
-        endLon: endPos.longitude,
-        endTime: endPos.fixTime,
-        endAddress: endPos.address,
-        endTimeIsOut: true,
-        duration: new Date(endPos.fixTime).getTime() - new Date(startPos.fixTime).getTime(),
-        driverUniqueId: null,
-        driverName: null
-    }
+function calculateTrip (device, route) {
+  const startPos = route[0]
+  const endPos = route[route.length - 1]
+
+  return {
+    deviceId: device.id,
+    deviceName: device.name,
+    distance: route.reduce((a, b) => a + b.attributes.distance, 0),
+    averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
+    maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
+    spentFuel: 0,
+    startOdometer: startPos.attributes.odometer || startPos.attributes.totalDistance,
+    endOdometer: endPos.attributes.odometer || endPos.attributes.totalDistance,
+    startPositionId: startPos.id,
+    endPositionId: endPos.id,
+    startLat: startPos.latitude,
+    startLon: startPos.longitude,
+    startTime: startPos.fixTime,
+    startAddress: startPos.address,
+    endLat: endPos.latitude,
+    endLon: endPos.longitude,
+    endTime: endPos.fixTime,
+    endAddress: endPos.address,
+    endTimeIsOut: true,
+    duration: new Date(endPos.fixTime).getTime() - new Date(startPos.fixTime).getTime(),
+    driverUniqueId: null,
+    driverName: null
+  }
+}
+
+function getTripIdleTime (trip, idleEvents) {
+  const tripStartDate = new Date(trip.startTime)
+  const tripEndDate = new Date(trip.endTime)
+  const idleEventsInsideTrip = idleEvents.filter(i => tripStartDate < new Date(i.position.fixTime) && tripEndDate > new Date(i.position.fixTime))
+  return idleEventsInsideTrip.reduce((a, b) => a + b.idleTime, 0)
 }
 
 exports.checkTripsKms = checkTripsKms
@@ -177,3 +180,4 @@ exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.addNearestPOIs = addNearestPOIs
 exports.calculateTrip = calculateTrip
+exports.getTripIdleTime = getTripIdleTime

package/src/zone-report.js

@@ -53,26 +53,24 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 30)
+  const sliced = automaticReports.sliceArray(devices, 20)
 
-  const deviceCount = { count: 0 }
-  const promises = []
+  let deviceCount = 0
   for (const slice of sliced) {
-    promises.push(traccarHelper.getAllInOne(
+    const allInOne = await traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, 20, 5, deviceCount).then(async allInOne => {
-      const routeData = allInOne.route
+      deviceCount, devices.length, 20, 5)
+    const routeData = allInOne.route
 
-      const data = getInAndOutEvents(slice, routeData, userData)
+    const data = getInAndOutEvents(slice, routeData, userData)
 
-      console.log('Geofence Enter/Exit Alerts:' + data.length)
+    console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-      if (data.length) {
-        allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
-      }
-    }))
+    if (data.length) {
+      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
+    }
+    deviceCount = deviceCount + slice.length
   }
-  await Promise.all(promises)
 
   reportData.push(allData)