fleetmap-reports 1.0.508 → 1.0.509

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.508",
+  "version": "1.0.509",
   "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,21 @@ 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 = 40
+    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)),
+      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 +51,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

@@ -260,6 +260,8 @@ 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 +363,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 +370,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) {