fleetmap-reports 2.0.188 → 2.0.190

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "2.0.188",
3
+ "version": "2.0.190",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -124,7 +124,7 @@ async function getAllInOne (
124
124
  try {
125
125
  result.push(...(await Promise.all(requests)))
126
126
  } catch (e) {
127
- console.log('parallel', e)
127
+ console.log('parallel', e.message, e.config, e.response)
128
128
  }
129
129
  console.log('took', new Date() - now, 'ms')
130
130
  }
@@ -23,8 +23,7 @@ const { checkGeofenceIn } = require('./util/geofence')
23
23
  const { parallel } = require('./util/parallel')
24
24
  const { getDataByDay } = require('./util/trips')
25
25
  const axios = require('axios').default
26
- const sliceSize = 12
27
- const deviceChunk = 5
26
+ const sliceSize = 6
28
27
  const fileName = 'ZoneReport'
29
28
 
30
29
  async function createZoneReport (from, to, userData, traccar) {
@@ -66,13 +65,14 @@ async function createZoneReport (from, to, userData, traccar) {
66
65
  }
67
66
 
68
67
  const reportRangeDays = (new Date(to).getTime() - new Date(from).getTime()) / (1000 * 60 * 60 * 24)
69
- const sliced = automaticReports.sliceArray(devices, reportRangeDays > 31 ? 1 : sliceSize)
68
+ const devicesPerRequest = reportRangeDays > 31 ? 1 : sliceSize
69
+ const sliced = automaticReports.sliceArray(devices, devicesPerRequest)
70
70
 
71
71
  let deviceCount = 0
72
72
  for (const slice of sliced) {
73
73
  const data = await traccarHelper.getAllInOne(
74
74
  traccar, from, to, slice, true, false, false, false,
75
- deviceCount, devices.length, sliceSize, reportRangeDays > 31 ? 1 : deviceChunk, undefined)
75
+ deviceCount, devices.length, sliceSize, devicesPerRequest, undefined)
76
76
 
77
77
  const route = filterPositions(data.route)
78
78
  const alerts = []