fleetmap-reports 1.0.822 → 1.0.824

package/package.json

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

package/src/events-report.js

@@ -9,6 +9,7 @@ const { devicesToProcess } = require('./util/device')
 const { isInside } = require('./util/timetable')
 const { getDigitalPortValue } = require('./location-report')
 const { maxParallelRequests } = require('./automaticReports')
+const { getNearestPOI } = require('./util/geofence')
 
 const fileName = 'EventReport'
 
@@ -82,6 +83,10 @@ async function processDevices (from, to, devices, data, traccar, userData) {
       for (const a of deviceAlerts) {
         a.position = positions.find(p => p.id === a.positionId)
 
+        if (!a.geofenceId) {
+          const poi = getNearestPOI(a.position, userData.geofences)
+          a.geofenceId = poi && poi.id
+        }
         if (a.geofenceId) {
           const geofence = userData.geofences.find(g => g.id === a.geofenceId)
           if (geofence) {

package/src/partnerReports/afriquia.js

@@ -6,6 +6,11 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
+
+function calculateFirstStopTime (stopTime, from, time) {
+  return stopTime + (new Date(time).getTime() - from.getTime())
+}
+
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/tests/activity.test.js

@@ -72,14 +72,4 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
-  it('Activity test performance', async () => {
-    const report = await getReports('q.trans', 'quality1214')
-    const userData = await report.getUserData()
-    console.log(userData)
-    userData.groupByDay = true
-    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
-        new Date(2023, 31, 5, 23, 59, 59, 0),
-        userData)
-    assert.equal(data.length, 1)
-  }, 8000000)
 })

package/src/tests/zones.test.js

@@ -32,18 +32,6 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
-  it('works with afriquia', async () => {
-    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
-    const userData = await report.getUserData()
-    console.log(userData.devices.length)
-    console.log(userData.geofences)
-    const result = await report.zoneReport(
-        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
-        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
-        userData)
-    console.log('result', result)
-  }, 4000000)
-
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)

package/src/util/geofence.js

@@ -16,7 +16,8 @@ exports.insideGeofence = function insideGeofence (position, geofence) {
   return inside.default(pt, poly)
 }
 
-exports.getNearestPOIs = function getNearestPOIs (long, lat, geofences) {
+exports.getNearestPOI = (position, geofences) => getNearestPOIs(position.longitude, position.latitude, geofences)[0]
+function getNearestPOIs (long, lat, geofences) {
   const distance = geofences
     .filter(g => g && g.area.startsWith('CIRCLE'))
     .map(g => {
@@ -29,6 +30,7 @@ exports.getNearestPOIs = function getNearestPOIs (long, lat, geofences) {
     })
   return distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
 }
+exports.getNearestPOIs = getNearestPOIs
 
 exports.loadGroupsData = async function loadGroupsData (userData, traccarInstance) {
   for (const g of userData.groups) {

package/src/zone-report.js

@@ -195,7 +195,7 @@ async function processDevices (from, to, devices, userData, data) {
                 outGeofenceName: a.geofenceName,
                 inTime: zoneInOutData[index + 1].inTime,
                 inGeofenceName: zoneInOutData[index + 1].geofenceName,
-                distanceOut: a.distanceOut,
+                distanceOut: a.distanceOutAny,
                 totalOutTime: new Date(zoneInOutData[index + 1].inTime.fixTime).getTime() - new Date(a.outTime.fixTime).getTime()
               })
             }
@@ -339,7 +339,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         new Date(p.fixTime).getTime() >= outDate &&
           new Date(p.fixTime).getTime() < anyNextIn
       )
-      const distanceOutAny = zoneInData.length < 2 ? calculateDistance(routeAfterOutAndBeforeAnyNextIn) : 0
+      const distanceOutAny = Object.keys(zoneInData).length < 2 ? calculateDistance(routeAfterOutAndBeforeAnyNextIn) : 0
 
       if (zoneInData[a.geofenceId]) {
         const totalInTime = new Date(a.position.fixTime).getTime() - new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
@@ -361,7 +361,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
           stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
           driverName: zoneInData[a.geofenceId].position.driverName
         })
-        zoneInData[a.geofenceId] = null
+        delete zoneInData[a.geofenceId]
       } else {
         const totalInTime = new Date(a.position.fixTime).getTime() - from.getTime()
         const routeIn = deviceRoute.filter(p =>