fleetmap-reports 1.0.508 → 1.0.510

package/package.json

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

package/src/index.test.js

@@ -6,7 +6,7 @@ async function getSpeedingReport (report, userData) {
     new Date(Date.UTC(2022, 1, 17, 0, 0, 0, 0)),
     new Date(Date.UTC(2022, 1, 17, 23, 59, 59, 0)),
     userData)
-  assert.equal(data.length, 1)
+
   const device = data[0].devices.find(d => d.device.id === 22326)
   const totalDistance = device.alerts.reduce((a, b) => a + b.distance, 0)
   const totalEventTime = device.alerts.reduce((a, b) => a + b.eventTime, 0)
@@ -16,7 +16,7 @@ async function getSpeedingReport (report, userData) {
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
   // eslint-disable-next-line no-undef
-  it('Speeding by device', async () => {
+  it('works with road speed limits', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.roadSpeedLimits = true
@@ -25,6 +25,22 @@ describe('Test_Reports', function () {
     assert.equal(totalDistance, 36.63687856826021) // Total Kms
     assert.equal(totalEventTime, 1524000) // Total Duration
   }, 200000)
+
+  it('works by device speed limit', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.roadSpeedLimits = false
+    userData.customSpeed = false
+    userData.useVehicleSpeedLimit = true
+    const data = await report.speedingReport(
+      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)
+    assert.equal(device.alerts.length, 75) // Total Alerts
+  }, 900000)
+
   // eslint-disable-next-line no-undef
   it('Speeding with custom speed', async () => {
     const report = await getReports()
@@ -36,7 +52,7 @@ describe('Test_Reports', function () {
     assert.equal(device.alerts.length, 13) // Total Alerts
     assert.equal(totalDistance, 46.64576895855739) // Total Kms
     assert.equal(totalEventTime, 1402000) // Total Duration
-  }, 20000)
+  }, 999990000)
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()

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)
           }
@@ -260,9 +258,10 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
             a.driver = (driver && driver.name) || a.position.attributes.driverUniqueId
           }
           a.deviceName = d.name
+        } else {
+          console.error('cant find position for event', a)
         }
       }
-      deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
     }
   }
 }
@@ -361,7 +360,6 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
   let dist = 0
   while (pIndex + 1 < positions.length) {
     pIndex++
-    console.log(pIndex)
     dist += distance.default(point([endEventPosition.longitude, endEventPosition.latitude]),
       point([positions[pIndex].longitude, positions[pIndex].latitude]))
     endEventPosition = positions[pIndex]
@@ -369,7 +367,6 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
       alert.eventTime = new Date(endEventPosition.fixTime) - new Date(alert.position.fixTime)
       alert.attributes.maxSpeed = maxSpeed
       alert.distance = dist
-      console.log(alert)
       break
     } else {
       if (maxSpeed < endEventPosition.speed) {