fleetmap-reports 1.0.400 → 1.0.401
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/speeding-report.js +7 -6
package/package.json
CHANGED
package/src/speeding-report.js
CHANGED
|
@@ -12,7 +12,7 @@ const traccarHelper = require('./util/traccar')
|
|
|
12
12
|
const { devicesToProcess } = require('./util/device')
|
|
13
13
|
const turf = require('@turf/distance')
|
|
14
14
|
const { point } = require('@turf/helpers')
|
|
15
|
-
const distance = require('@turf/distance')
|
|
15
|
+
const distance = require('@turf/distance')
|
|
16
16
|
|
|
17
17
|
const fileName = 'SpeedingReport'
|
|
18
18
|
const eventTypes = ['deviceOverspeed']
|
|
@@ -73,14 +73,15 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
|
|
|
73
73
|
const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
|
|
74
74
|
const routes = allInOne.route
|
|
75
75
|
const events = []
|
|
76
|
-
if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
|
|
77
|
-
events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
|
|
78
|
-
} else {
|
|
79
|
-
events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
|
|
80
|
-
}
|
|
81
76
|
|
|
82
77
|
if (userData.roadSpeedLimits) {
|
|
83
78
|
events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
|
|
79
|
+
} else {
|
|
80
|
+
if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
|
|
81
|
+
events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
|
|
82
|
+
} else {
|
|
83
|
+
events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
|
|
84
|
+
}
|
|
84
85
|
}
|
|
85
86
|
|
|
86
87
|
if (!events.length) {
|