fleetmap-reports 1.0.976 → 1.0.978

package/package.json

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

package/src/speeding-report.js

@@ -366,13 +366,13 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
       console.log(e.message, 'retry:', retry)
       return invokeValhalla(route, i, chunk, country, threshold, results, retry)
     } else {
-      console.error(e.message, e.response && e.response.data, slice[0])
+      console.error(e.message, e.response && e.response.data, 'deviceId', slice[0] && slice[0].deviceId, slice[0] && slice[0].address)
     }
   }
 }
 
 async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
-  const chunk = 1000
+  const chunk = 500
   const events = []
   for (const d of devices) {
     const route = routes.filter(r => r.deviceId === d.id)

package/src/trip-report.js

@@ -139,7 +139,11 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
     d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
     d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
-    d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+    d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+
+    d.trips.forEach((trip, i) => {
+      trip.stopDuration = (i !== d.trips.length - 1 ? (new Date(d.trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
+    })
   })
 
   return report
@@ -274,8 +278,8 @@ async function processDrivers (from, to, userData, data) {
         filteredTrips.push(t)
       }
     }
-    filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-    filteredTrips.forEach(function (trip, i) {
+
+    filteredTrips.forEach(trip => {
       trip.totalKms = trip.distance / 1000
 
       const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
@@ -286,7 +290,6 @@ async function processDrivers (from, to, userData, data) {
       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)
-      trip.stopDuration = (i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
     })
 
     if (filteredTrips.length > 0) {