fleetmap-reports 1.0.412 → 1.0.413

package/package.json

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

package/src/util/geofence.js

@@ -1,12 +1,13 @@
-const turf = require('turf')
+const turf = require('@turf/helpers')
+const inside = require('@turf/boolean-point-in-polygon')
 
-exports.insideGeofence = function insideGeofence(position, geofence) {
-    const coords = geofence.area.slice(9, geofence.area.length-2).split(',')
-    const coords2 = coords.map(c => {
-         return c.trim().split(' ').map(a => parseFloat(a))
-    })
-    var pt = turf.point([parseFloat(position.latitude), parseFloat(position.longitude)]);
-    var poly = turf.polygon([coords2]);
+exports.insideGeofence = function insideGeofence (position, geofence) {
+  const coords = geofence.area.slice(9, geofence.area.length - 2).split(',')
+  const coords2 = coords.map(c => {
+    return c.trim().split(' ').map(a => parseFloat(a))
+  })
+  const pt = turf.point([parseFloat(position.latitude), parseFloat(position.longitude)])
+  const poly = turf.polygon([coords2])
 
-    return turf.inside(pt, poly)
+  return inside.default(pt, poly)
 }

package/src/zone-report.js

@@ -53,26 +53,24 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 30)
+  const sliced = automaticReports.sliceArray(devices, 20)
 
-  const deviceCount = { count: 0 }
-  const promises = []
+  let deviceCount = 0
   for (const slice of sliced) {
-    promises.push(traccarHelper.getAllInOne(
+    const allInOne = await traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, 20, 5, deviceCount).then(async allInOne => {
-      const routeData = allInOne.route
+      deviceCount, devices.length, 20, 5)
+    const routeData = allInOne.route
 
-      const data = getInAndOutEvents(slice, routeData, userData)
+    const data = getInAndOutEvents(slice, routeData, userData)
 
-      console.log('Geofence Enter/Exit Alerts:' + data.length)
+    console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-      if (data.length) {
-        allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
-      }
-    }))
+    if (data.length) {
+      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
+    }
+    deviceCount = deviceCount + slice.length
   }
-  await Promise.all(promises)
 
   reportData.push(allData)