fleetmap-reports 1.0.729 → 1.0.731

package/package.json

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

package/src/util/parallel.js

@@ -11,7 +11,7 @@ exports.parallel = (report, method, toSlice, ...args) => {
         cluster.setupPrimary({
           exec: path.resolve(__dirname, 'worker.js')
         })
-        const sliced = sliceArray(toSlice, toSlice.length / numCPUs)
+        const sliced = sliceArray(toSlice, toSlice.length / (numCPUs - 1))
         const _result = []
         let done = 0
         let workerCount = 0
@@ -39,6 +39,9 @@ exports.parallel = (report, method, toSlice, ...args) => {
 
         cluster.on('exit', (worker, code, signal) => {
           console.log('Worker died', worker.process.pid, code, signal)
+          if (signal === 'SIGKILL') {
+            reject(new Error(`Worker died ${worker.process.pid}, code ${code} signal ${signal}`))
+          }
         })
       }
     })

package/src/util/route.js

@@ -41,6 +41,20 @@ function filterPositions (positions) {
   return positions.filter(filterPosition)
 }
 
+exports.cleanPositions = (positions) => {
+  return positions.map(p => {
+    return {
+      id: p.id,
+      fixTime: p.fixTime,
+      address: p.address,
+      latitude: p.latitude,
+      longitude: p.longitude,
+      deviceId: p.deviceId,
+      speed: p.speed
+    }
+  })
+}
+
 function filterPosition (p) {
   if (p.valid === false) {
     return p.attributes.ignition || p.attributes.motion

package/src/zone-report.js

@@ -13,7 +13,10 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const axios = require('axios')
-const { filterPositions } = require('./util/route')
+const {
+  filterPositions,
+  cleanPositions
+} = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const sliceSize = 100
@@ -67,7 +70,7 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
     const route = filterPositions(data.route)
-    const alerts = await parallel('zone-report', 'getInAndOutEvents', slice, route, userData)
+    const alerts = await parallel('zone-report', 'getInAndOutEvents', slice, cleanPositions(route), userData)
     allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
 
     deviceCount = deviceCount + slice.length