fleetmap-reports 1.0.706 → 1.0.707

package/package.json

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

package/src/util/index.js

@@ -1,6 +1,7 @@
 const { devicesToProcess } = require('./device')
+const { isClientSide } = require('./utils')
 
 exports.processServerSide = (userData) => {
   const devices = devicesToProcess(userData)
-  return devices.length > 100 && !userData.reportServer
+  return devices.length > 100 && isClientSide()
 }

package/src/zone-report.js

@@ -75,7 +75,7 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
     const route = filterPositions(data.route)
-    const alerts = getInAndOutEvents(slice, route, userData)
+    const alerts = await getInAndOutEvents(slice, route, userData)
 
     allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
 
@@ -300,11 +300,11 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
   return zoneInOutData
 }
 
-function getInAndOutEvents (devices, route, userData) {
+async function getInAndOutEvents (devices, route, userData) {
   const events = []
   const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
 
-  devices.forEach(d => {
+  await Promise.all(devices.map(async d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
     const deviceEvents = []
@@ -336,7 +336,7 @@ function getInAndOutEvents (devices, route, userData) {
       })
     })
     events.push(...deviceEvents)
-  })
+  }))
   return events
 }