fleetmap-reports 1.0.491 → 1.0.493

package/package.json

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

package/src/speeding-report.js

@@ -102,20 +102,21 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
 async function createSpeedingReportByDriver (from, to, userData, traccarInstance) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver', devices.length)
-
-  if (!devices.length) {
-    // empty report
-    return { drivers: [] }
-  }
-
-  const { routes, events } = await getEvents(traccarInstance, from, to, devices, userData)
-
-  if (!events.length) {
-    // empty report
-    return { drivers: [] }
+  const _drivers = []
+  const sliced = automaticReports.sliceArray(devices, 10)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const { routes, events } = await getEvents(traccarInstance, from, to, devices, userData, deviceCount, devices.length, slice.length)
+    if (processServerSide()) {
+      console.log('LOADING_MESSAGE:' + slice[0].name)
+      console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
+    }
+    if (events.length > 0) {
+      _drivers.push(...(await processDrivers(from, to, events, routes, userData)))
+    }
+    deviceCount = deviceCount + slice.length
   }
-
-  return { drivers: await processDrivers(from, to, events, routes, userData) }
+  return { drivers: _drivers }
 }
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
@@ -298,7 +299,7 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getHereEvents (devices, routes, threshold) {
   try {
     console.log('env', process.env.PROCESS_HERE_EVENTS)
-    console.log('here speed limit events')
+    console.log('here speed limit events', devices.length, 'devices')
     const events = []
     const promises = devices.map(d => new Promise((resolve) => {
       const positions = routes.filter(p => p.deviceId === d.id)
@@ -307,6 +308,7 @@ async function getHereEvents (devices, routes, threshold) {
         resolve()
       }
       here.routeMatch(positions).then(results => {
+        console.log(d.name, 'got', results.length, 'from here')
         const reduced = results.reduce((acc, cur, idx, src) => {
           cur.overSpeeding = cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)
           const last = acc.length && acc.slice(-1)[0]