fleetmap-reports 1.0.645 → 1.0.647

package/package.json

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

package/src/idle-report.js

@@ -8,7 +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 { getNearestPOIs, insideGeofence, loadGroupsData} = require('./util/geofence')
 
 const fileName = 'IdleReport'
 
@@ -213,12 +213,6 @@ function findGeofenceData (event, userData) {
   }
 }
 
-async function loadGroupsData (userData, traccarInstance) {
-  for (const g of userData.groups) {
-    g.geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, g.id, undefined, undefined).then(r => r.data)).map(g => g.id)
-  }
-}
-
 async function exportIdleReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 

package/src/stop-report.js

@@ -1,7 +1,7 @@
 const { devicesToProcess, deviceName } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
-const { getNearestPOIs, insideGeofence } = require('./util/geofence')
+const { getNearestPOIs, insideGeofence, loadGroupsData} = require('./util/geofence')
 const { getTranslations, convertToLocaleString, convertMS, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
@@ -27,6 +27,8 @@ async function createStopReportByDevice (from, to, userData, traccar) {
     devices: []
   }
 
+  await loadGroupsData(userData, traccar)
+
   const sliced = automaticReports.sliceArray(devices, 5)
 
   let deviceCount = 0
@@ -59,7 +61,7 @@ function processDevices (from, to, devices, data, userData) {
         stop.endPOIName = nearestPOIs[0].p.name
       }
 
-      const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).some(g =>
+      const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
         insideGeofence({ latitude: stop.latitude, longitude: stop.longitude }, g)
       )
       if (geofence) {

package/src/util/geofence.js

@@ -26,3 +26,9 @@ exports.getNearestPOIs = function getNearestPOIs (long, lat, geofences) {
     })
   return distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
 }
+
+exports.loadGroupsData = async function loadGroupsData (userData, traccarInstance) {
+  for (const g of userData.groups) {
+    g.geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, g.id, undefined, undefined).then(r => r.data)).map(g => g.id)
+  }
+}