fleetmap-reports 1.0.490 → 1.0.491

package/package.json

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

package/src/index.test.js

@@ -3,15 +3,13 @@ const assert = require('assert')
 
 async function getSpeedingReport (report, userData) {
   const data = await report.speedingReport(
-    new Date(Date.UTC(2022, 7, 15, 0, 0, 0, 0)),
-    new Date(Date.UTC(2022, 7, 15, 23, 59, 59, 0)),
+    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[0]
-  console.log(device)
+  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)
-  console.log(device.alerts)
   return { device, totalDistance, totalEventTime }
 }
 
@@ -23,10 +21,9 @@ describe('Test_Reports', function () {
     const userData = await report.getUserData()
     userData.roadSpeedLimits = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 16) // Total Alerts
-    console.log(device.alerts)
-    assert.equal(totalDistance, 74.71054403083238) // Total Kms
-    assert.equal(totalEventTime, 3009000) // Total Duration
+    assert.equal(device.alerts.length, 104) // Total Alerts
+    assert.equal(totalDistance, 36.6525856031222) // Total Kms
+    assert.equal(totalEventTime, 1524000) // Total Duration
   }, 200000)
   // eslint-disable-next-line no-undef
   it('Speeding with custom speed', async () => {
@@ -36,9 +33,9 @@ describe('Test_Reports', function () {
     userData.useVehicleSpeedLimit = false
     userData.customSpeed = 100
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 24) // Total Alerts
-    assert.equal(totalDistance, 49.481065231791064) // Total Kms
-    assert.equal(totalEventTime, 1523000) // Total Duration
+    assert.equal(device.alerts.length, 13) // Total Alerts
+    assert.equal(totalDistance, 46.64576895855739) // Total Kms
+    assert.equal(totalEventTime, 1402000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
@@ -261,7 +258,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.summary[0].startOdometer, 122502742.59)
-    assert.equal(device.summary[0].distance, 1404204.4299999028)
+    assert.equal(device.summary[0].distance, 1427444.4699999243)
     assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
     assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
   }, 40000)
@@ -289,7 +286,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.summary[5].startOdometer, 122923290.95)
-    assert.equal(device.summary[5].distance, 77021.6400000006)
+    assert.equal(device.summary[5].distance, 77033.18999999762)
     assert.equal(device.summary[5].startTime, '2022-01-06T18:35:36.000+0000')
     assert.equal(device.summary[5].endTime, '2022-01-06T19:54:27.000+0000')
   }, 90000)

package/src/speeding-report.js

@@ -233,6 +233,7 @@ async function processDevices (from, to, devices, events, routes, userData) {
 async 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) {
@@ -256,8 +257,6 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
             a.driver = (driver && driver.name) || a.position.attributes.driverUniqueId
           }
           a.deviceName = d.name
-
-          return pIndex
         }
       }
       deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
@@ -351,6 +350,7 @@ 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]
@@ -358,6 +358,7 @@ 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) {