fleetmap-reports 1.0.593 → 1.0.595

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.593",
+  "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()
@@ -412,4 +364,17 @@ describe('Test_Reports', function () {
     assert.equal(device.geofences[0].totalTime, '28777')
     assert.equal(device.geofences[0].geofenceName, 'Casa João')
   }, 30000)
+  // eslint-disable-next-line no-undef
+  it('Zone Report With Stops', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.onlyWithStop = true
+    const data = await report.zoneReport(new Date(2023, 1, 1, 0, 0, 0, 0),
+      new Date(2023, 1, 5, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 82063)
+    assert.equal(device.geofences.length, 15)
+  }, 30000)
 })

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)
+})

package/src/util/route.js

@@ -36,4 +36,20 @@ function getIdleEvents (route, driver) {
 
   return idleEvents
 }
+
+function filterPositions (positions) {
+  return positions.filter(filterPosition)
+}
+
+function filterPosition (p) {
+  if (p.valid === false) {
+    return p.attributes.ignition || p.attributes.motion
+  }
+  if (p.protocol === 'osmand') {
+    return !(p.attributes.event >= 200 || p.attributes.event === 30)
+  }
+  return true
+}
+
 exports.getIdleEvents = getIdleEvents
+exports.filterPositions = filterPositions

package/src/zone-report.js

@@ -13,6 +13,7 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const distance = require('@turf/distance')
 const axios = require('axios')
 const { processServerSide } = require('./util')
+const { filterPositions } = require('./util/route')
 const sliceSize = 200
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -68,11 +69,13 @@ async function createZoneReport (from, to, userData, traccar) {
       traccar, from, to, slice, true, false, false, false,
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
-    const alerts = getInAndOutEvents(slice, data.route, userData)
+    const route = filterPositions(data.route)
+
+    const alerts = getInAndOutEvents(slice, route, userData)
     console.log('Geofence Enter/Exit Alerts:' + alerts.length)
 
     if (alerts.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route: data.route }))
+      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -87,6 +90,8 @@ async function processDevices (from, to, devices, userData, data) {
 
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
+    const deviceRoute = data.route.filter(p => p.deviceId === d.id)
+
     if (alerts.length > 0) {
       const zoneInOutData = []
       const zoneInData = {}
@@ -101,9 +106,8 @@ async function processDevices (from, to, devices, userData, data) {
             const geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (zoneInData[a.geofenceId]) {
               const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
-              const route = data.route.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
+              const route = deviceRoute.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
                   new Date(p.fixTime).getTime() <= new Date(a.position.fixTime).getTime())
-              console.log(route)
               if (geofence) {
                 zoneInOutData.push({
                   inTime: zoneInData[a.geofenceId].position,
@@ -167,6 +171,9 @@ function getInAndOutEvents (devices, route, userData) {
 
     const entryMap = []
     routePoints.forEach(p => {
+      if (!p.properties.position.valid) {
+        return
+      }
       geofencesFeatures.forEach(g => {
         if (g.geometry.type === 'Polygon') {
           if (booleanPointInPolygon.default(p, g)) {
@@ -343,7 +350,6 @@ function exportZoneReportToExcel (userData, reportData) {
         }
       }))
     })
-    console.log(data)
     return {
       headers,
       data,