fleetmap-reports 1.0.538 → 1.0.540

package/package.json

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

package/src/zone-report.js

@@ -7,7 +7,6 @@ const { headerFromUser } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
-const traccarHelper = require('./util/traccar')
 const pointToLineDistance = require('@turf/point-to-line-distance')
 const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const distance = require('@turf/distance')
@@ -59,16 +58,13 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 100)
+  const sliced = automaticReports.sliceArray(devices, 200)
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(
+    const data = await getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, 50, 5)
-    const routeData = allInOne.route
-
-    const data = getInAndOutEvents(slice, routeData, userData)
+      deviceCount, devices.length, 200, 5, undefined, userData)
 
     console.log('Geofence Enter/Exit Alerts:' + data.length)
 
@@ -83,6 +79,53 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
+async function getAllInOne (
+  traccar,
+  from,
+  to,
+  devices,
+  getRoutes,
+  getTrips,
+  getStops,
+  getSummary,
+  currentDeviceCount = 0,
+  totalDevices = devices.length,
+  sliceSize = 5,
+  devicesPerRequest = 1,
+  counter = undefined,
+  userData) {
+  let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
+  if (getRoutes) url += '&type=route'
+  if (getTrips) url += '&type=trips'
+  if (getStops) url += '&type=stops'
+  if (getSummary) url += '&type=summary'
+
+  const sliced = automaticReports.sliceArray(devices, sliceSize)
+  const result = []
+  for (const chunk of sliced) {
+    const requests = []
+    for (const _chunk of automaticReports.sliceArray(chunk, devicesPerRequest)) {
+      const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
+      requests.push(
+        traccar.axios.get(u, {
+          jar: traccar.cookieJar,
+          withCredentials: true
+        }).then(r => r.data).then(x => {
+          if (counter) {
+            counter.count += devicesPerRequest
+            console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
+          } else {
+            currentDeviceCount += devicesPerRequest
+            console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          }
+          return getInAndOutEvents(devices, x.route, userData)
+        }))
+    }
+    result.push(...(await Promise.all(requests)))
+  }
+  return result
+}
+
 async function processDevices (from, to, devices, drivers, geofences, data) {
   const devicesResult = []