fleetmap-reports 1.0.671 → 1.0.673
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 +1 -1
- package/src/tests/ellca.json +46 -0
- package/src/tests/zones.test.js +17 -0
- package/src/util/traccar.js +3 -0
- package/src/zone-report.js +1 -1
package/package.json
CHANGED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
[
|
|
2
|
+
"KRS5330",
|
|
3
|
+
"LTR6D02",
|
|
4
|
+
"LTS8J58",
|
|
5
|
+
"LUA4F53",
|
|
6
|
+
"LUN9B64",
|
|
7
|
+
"RJN0J89",
|
|
8
|
+
"RJP0I18",
|
|
9
|
+
"RJY4A56",
|
|
10
|
+
"RKT2C85",
|
|
11
|
+
"RKU3F60",
|
|
12
|
+
"EPA5I95",
|
|
13
|
+
"ESV3G14",
|
|
14
|
+
"FKT3J22",
|
|
15
|
+
"JAD3F55",
|
|
16
|
+
"JAJ1C36",
|
|
17
|
+
"KRX2869",
|
|
18
|
+
"KXG9094",
|
|
19
|
+
"KZA5664",
|
|
20
|
+
"KZA5940",
|
|
21
|
+
"LMT4A13",
|
|
22
|
+
"LTY8D84",
|
|
23
|
+
"RIP4C67",
|
|
24
|
+
"RIZ0H12",
|
|
25
|
+
"RJA0F90",
|
|
26
|
+
"RJG4J53",
|
|
27
|
+
"RJH4J70",
|
|
28
|
+
"RJJ5E13",
|
|
29
|
+
"RJK9F52",
|
|
30
|
+
"RJL1E23",
|
|
31
|
+
"RJL1E26",
|
|
32
|
+
"RJM5G37",
|
|
33
|
+
"RJN9G45",
|
|
34
|
+
"RJP3C03",
|
|
35
|
+
"RJR4G53",
|
|
36
|
+
"RJV8G79",
|
|
37
|
+
"RJY4A55",
|
|
38
|
+
"RKC9H45",
|
|
39
|
+
"RKG0I43",
|
|
40
|
+
"RKG3D47",
|
|
41
|
+
"RKK9G32",
|
|
42
|
+
"RKR3I02",
|
|
43
|
+
"RKR3I09",
|
|
44
|
+
"RKR3I10",
|
|
45
|
+
"RKS1A72"
|
|
46
|
+
]
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
const { getReports } = require('./index')
|
|
2
|
+
describe('zones', function () {
|
|
3
|
+
it('works with ellca', async () => {
|
|
4
|
+
const report = await getReports()
|
|
5
|
+
const userData = await report.getUserData()
|
|
6
|
+
const ellca = require('./ellca.json')
|
|
7
|
+
userData.devices = userData.devices.filter(d => ellca.find(e => e === d.name))
|
|
8
|
+
console.log(userData.devices.length)
|
|
9
|
+
userData.geofences = userData.geofences.filter(g => g.name === 'Geofence Ellca')
|
|
10
|
+
console.log(userData.geofences)
|
|
11
|
+
const result = await report.zoneReport(
|
|
12
|
+
new Date(Date.UTC(2022, 6, 24, 0, 0, 0, 0)),
|
|
13
|
+
new Date(Date.UTC(2022, 6, 25, 23, 59, 59, 0)),
|
|
14
|
+
userData)
|
|
15
|
+
console.log('result', result)
|
|
16
|
+
}, 4000000)
|
|
17
|
+
})
|
package/src/util/traccar.js
CHANGED
|
@@ -91,6 +91,7 @@ async function getAllInOne (
|
|
|
91
91
|
const requests = []
|
|
92
92
|
for (const _chunk of automaticReports.sliceArray(chunk, devicesPerRequest)) {
|
|
93
93
|
const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
|
|
94
|
+
console.log(u)
|
|
94
95
|
requests.push(
|
|
95
96
|
traccar.axios.get(u, {
|
|
96
97
|
jar: traccar.cookieJar,
|
|
@@ -107,7 +108,9 @@ async function getAllInOne (
|
|
|
107
108
|
return x
|
|
108
109
|
}))
|
|
109
110
|
}
|
|
111
|
+
const now = new Date()
|
|
110
112
|
result.push(...(await Promise.all(requests)))
|
|
113
|
+
console.log('took', new Date() - now, 'ms')
|
|
111
114
|
}
|
|
112
115
|
return {
|
|
113
116
|
route: result.filter(t => t.route).map(r => r.route).flat(),
|
package/src/zone-report.js
CHANGED
|
@@ -18,7 +18,7 @@ const distance = require('@turf/distance')
|
|
|
18
18
|
const axios = require('axios')
|
|
19
19
|
const { processServerSide } = require('./util')
|
|
20
20
|
const { filterPositions } = require('./util/route')
|
|
21
|
-
const sliceSize =
|
|
21
|
+
const sliceSize = 10
|
|
22
22
|
const deviceChunk = 2
|
|
23
23
|
const fileName = 'ZoneReport'
|
|
24
24
|
|