fleetmap-reports 1.0.431 → 1.0.432

package/package.json

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

package/src/speeding-report.js

@@ -276,42 +276,45 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getHereEvents (devices, routes, threshold) {
   console.log('here speed limit events')
   const events = []
-  for (const d of devices) {
+  const promises = devices.map(d => new Promise((resolve) => {
     const positions = routes.filter(p => p.deviceId === d.id)
     if (!positions.length) {
       console.log('no positions on device', d.name)
-      continue
+      resolve()
     }
     let hereAlerts = null
-    const results = await here.routeMatch(positions)
-    hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
-      const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
-      return {
-        ...r,
-        roadSpeedLimit: r.speedLimit,
-        deviceId: d.id,
-        position,
-        positionId: position && position.id,
-        attributes: { speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200 }
-      }
-    })
-    if (!hereAlerts.length) {
-      console.log('empty array after filter on device', d.name)
-      continue
-    }
-    const reduced = hereAlerts.length < 2
-      ? hereAlerts
-      : hereAlerts.reduce((acc, cur, idx, src) => {
-        if (idx === 1) {
-          return [cur]
-        }
-        if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
-          return acc.concat(cur)
+    here.routeMatch(positions).then(results => {
+      hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
+        const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
+        return {
+          ...r,
+          roadSpeedLimit: r.speedLimit,
+          deviceId: d.id,
+          position,
+          positionId: position && position.id,
+          attributes: {speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200}
         }
-        return acc
       })
-    events.push(...reduced)
-  }
+      if (!hereAlerts.length) {
+        console.log('empty array after filter on device', d.name)
+        resolve()
+      }
+      const reduced = hereAlerts.length < 2
+          ? hereAlerts
+          : hereAlerts.reduce((acc, cur, idx, src) => {
+            if (idx === 1) {
+              return [cur]
+            }
+            if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
+              return acc.concat(cur)
+            }
+            return acc
+          })
+      events.push(...reduced)
+      resolve()
+    })
+  }))
+  await Promise.all(promises)
   return events
 }