fleetmap-reports 1.0.594 → 1.0.595

package/package.json

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

package/src/speeding-report.js

@@ -135,7 +135,7 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
 
     const events = []
     if (userData.roadSpeedLimits) {
-      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold)
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
       console.log('got', hereResults.length, 'from here')
       events.push(...hereResults)
     } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
@@ -297,7 +297,7 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
   return events
 }
 
-async function getHereEvents (devices, routes, threshold) {
+async function getHereEvents (devices, routes, threshold, minimumMinutes = 0) {
   try {
     console.log('PROCESS_HERE_EVENTS', process.env.PROCESS_HERE_EVENTS)
     console.log('here speed limit events', devices.length, 'devices')
@@ -348,13 +348,13 @@ async function getHereEvents (devices, routes, threshold) {
       })
     }))
     await Promise.all(promises)
-    return events
+    return events.filter(e => e.eventTime >= minimumMinutes * 60 * 1000)
   } catch (e) {
     console.error(e)
   }
 }
 
-function calculateEventData (positions, pIndex, alert, device, geofence, userData) {
+function calculateEventData (positions, pIndex, alert, device, geofence) {
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
   let dist = 0

package/src/tests/index.test.js

@@ -3,18 +3,6 @@ const { getReports } = require('./index')
 const assert = require('assert')
 const utils = require('../util/utils')
 
-async function getSpeedingReport (report, userData) {
-  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)
-  const totalDistance = device.alerts.reduce((a, b) => a + b.distance, 0)
-  const totalEventTime = device.alerts.reduce((a, b) => a + b.eventTime, 0)
-  return { device, totalDistance, totalEventTime }
-}
-
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
   it('converts to pdf', async () => {
@@ -35,42 +23,6 @@ describe('Test_Reports', function () {
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
 
-  // eslint-disable-next-line no-undef
-  it('works with road speed limits', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.roadSpeedLimits = true
-    const { device } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 104) // Total Alerts
-    // assert.equal(totalDistance, 36.63687856826021) // Total Kms
-    // assert.equal(totalEventTime, 1524000) // Total Duration
-  }, 200000)
-  // eslint-disable-next-line no-undef
-  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, 23, 23, 59, 59, 0)),
-      userData)
-    assert.equal(data[0].devices.length, 0)
-  }, 900000)
-
-  // eslint-disable-next-line no-undef
-  it('Speeding with custom speed', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-
-    userData.useVehicleSpeedLimit = false
-    userData.customSpeed = 100
-    const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 13) // Total Alerts
-    assert.equal(totalDistance, 46.64576895855739) // Total Kms
-    assert.equal(totalEventTime, 1402000) // Total Duration
-  }, 999990000)
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()

package/src/tests/speeding.test.js

@@ -0,0 +1,62 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+
+async function getSpeedingReport (report, userData) {
+  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)
+  const totalDistance = device && device.alerts.reduce((a, b) => a + b.distance, 0)
+  const totalEventTime = device && device.alerts.reduce((a, b) => a + b.eventTime, 0)
+  return { device, totalDistance, totalEventTime }
+}
+// eslint-disable-next-line no-undef
+describe('speeding tests', function () {
+  // eslint-disable-next-line no-undef
+  it('works with road speed limits', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.roadSpeedLimits = true
+    const { device } = await getSpeedingReport(report, userData)
+    assert.equal(device.alerts.length, 104) // Total Alerts
+    console.log(device.alerts)
+
+    userData.minimumIdleTime = 1
+    const r = await getSpeedingReport(report, userData)
+    r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
+    assert.equal(r.device.alerts.length, 6) // Total Alerts
+  }, 200000)
+
+  // eslint-disable-next-line no-undef
+  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, 23, 23, 59, 59, 0)),
+      userData)
+    assert.equal(data[0].devices.length, 0)
+  }, 900000)
+
+  // eslint-disable-next-line no-undef
+  it('Speeding with custom speed', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    userData.useVehicleSpeedLimit = false
+    userData.customSpeed = 100
+    const {
+      device,
+      totalDistance,
+      totalEventTime
+    } = await getSpeedingReport(report, userData)
+    assert.equal(device.alerts.length, 13) // Total Alerts
+    assert.equal(totalDistance, 46.64576895855739) // Total Kms
+    assert.equal(totalEventTime, 1402000) // Total Duration
+  }, 999990000)
+})