fleetmap-reports 1.0.509 → 1.0.510

package/package.json

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

package/src/index.test.js

@@ -30,10 +30,11 @@ describe('Test_Reports', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.roadSpeedLimits = false
-    userData.customSpeed = 40
+    userData.customSpeed = false
+    userData.useVehicleSpeedLimit = true
     const data = await report.speedingReport(
-      new Date(Date.UTC(2022, 1, 17, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 1, 17, 23, 59, 59, 0)),
+      new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
+      new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
       userData)
     const device = data[0].devices.find(d => d.device.id === 22326)
     console.log('device', device)

package/src/speeding-report.js

@@ -56,7 +56,7 @@ async function createSpeedingReportByGroup (from, to, userData, traccarInstance)
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
       if (events.length > 0) {
-        groupData.devices = await processDevices(from, to, devices, events, routes, userData)
+        groupData.devices = processDevices(from, to, devices, events, routes, userData)
         reportData.push(groupData)
       }
     }
@@ -87,7 +87,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
     await Promise.all(sliced.map(async slice => {
       const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
       if (events.length > 0) {
-        const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
+        const devicesProcessed = processDevices(from, to, slice, events, routes, userData)
         allData.devices.push(...devicesProcessed)
       }
       deviceCount = deviceCount + slice.length
@@ -189,7 +189,7 @@ function getGeofenceSpeedLimitEvents (geofencesFeatures, routes, devices) {
 async function processDrivers (from, to, events, routes, userData) {
   const driversResult = []
 
-  await findEventsPosition(from, to, userData.devices, events, routes, userData)
+  findEventsPosition(from, to, userData.devices, events, routes, userData)
 
   userData.drivers.forEach(d => {
     const driverEvents = events.filter(e => e.position && e.position.attributes.driverUniqueId === d.uniqueId)
@@ -210,9 +210,9 @@ async function processDrivers (from, to, events, routes, userData) {
   return driversResult
 }
 
-async function processDevices (from, to, devices, events, routes, userData) {
+function processDevices (from, to, devices, events, routes, userData) {
   const devicesResult = []
-  await findEventsPosition(from, to, devices, events, routes, userData)
+  findEventsPosition(from, to, devices, events, routes, userData)
 
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
@@ -233,10 +233,9 @@ async function processDevices (from, to, devices, events, routes, userData) {
   return devicesResult
 }
 
-async function findEventsPosition (from, to, devices, events, routes, userData) {
+function findEventsPosition (from, to, devices, events, routes, userData) {
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
-    console.log(d.name, deviceEvents.length)
     if (deviceEvents.length > 0) {
       const positions = routes.filter(p => p.deviceId === d.id)
       for (const a of deviceEvents) {
@@ -251,7 +250,6 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
           }
 
           if (!userData.roadSpeedLimits) {
-            console.log('ignorting eventdata')
             a.position = positions[pIndex]
             calculateEventData(positions, pIndex, a, d, geofence, userData)
           }
@@ -264,7 +262,6 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
           console.error('cant find position for event', a)
         }
       }
-      deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
     }
   }
 }