fleetmap-reports 1.0.629 → 1.0.630

package/package.json

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

package/src/idle-report.js

@@ -8,6 +8,7 @@ const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver } = require('./util/driver')
+const { getNearestPOIs, insideGeofence } = require('./util/geofence')
 
 const fileName = 'IdleReport'
 
@@ -143,6 +144,8 @@ function processDrivers (from, to, userData, data) {
 
       if (filteredEvents.length) {
         filteredEvents.forEach(e => {
+          findGeofenceData(e, userData)
+
           const device = userData.devices.find(d => d.id === e.position.deviceId)
           e.deviceName = device ? device.name : ''
         })
@@ -170,6 +173,8 @@ function processDevices (from, to, devices, routes, userData) {
 
     if (filteredEvents.length) {
       filteredEvents.forEach(e => {
+        findGeofenceData(e, userData)
+
         const driver = userData.drivers.find(d => d.id === e.position.attributes.driverUniqueId)
         e.driver = driver ? driver.name : ''
       })
@@ -185,6 +190,20 @@ function processDevices (from, to, devices, routes, userData) {
   return devicesResult
 }
 
+function findGeofenceData (event, userData) {
+  const nearestPOIs = getNearestPOIs(event.position.longitude, event.position.latitude, userData.geofences)
+  if (nearestPOIs.length > 0) {
+    event.endPOIName = nearestPOIs[0].p.name
+  } else {
+    const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).some(g =>
+      insideGeofence({ latitude: event.position.latitude, longitude: event.position.longitude }, g)
+    )
+    if (geofence) {
+      event.endPOIName = geofence.name
+    }
+  }
+}
+
 async function exportIdleReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 
@@ -248,7 +267,7 @@ async function exportIdleReportToPDF (userData, reportData) {
 
         const footValues = [
           'Total:' + d.idleEvents.length,
-          '',
+          '', '', '',
           convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
         ]
 
@@ -351,11 +370,11 @@ function deviceName (device) {
   return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getIdleEventDate (user, position) {
+function getIdleEventDate (position, user) {
   return convertToLocaleDateString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
-function getIdleEventTime (user, position) {
+function getIdleEventTime (position, user) {
   return convertToLocaleTimeString(position.fixTime, user.attributes.lang, user.attributes.timezone)
 }