fleetmap-reports 1.0.403 → 1.0.406

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.403",
+  "version": "1.0.406",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -10,9 +10,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@turf/boolean-point-in-polygon": "^6.5.0",
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
-    "@turf/point-on-feature": "^6.5.0",
     "@turf/point-to-line-distance": "^6.5.0",
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",

package/src/index.test.js

@@ -338,7 +338,8 @@ describe('Test_Reports', function () {
     const device = data[0].devices.find(d => d.device.id === 25508)
     assert.equal(device.days.length, 25)
   }, 30000)
-  /*   it('Zone Report', async () => {
+  // eslint-disable-next-line no-undef
+  it('Zone Report', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
         const data = await report.zoneReport(new Date(2022, 3, 25, 0, 0, 0, 0),
@@ -347,10 +348,10 @@ describe('Test_Reports', function () {
 
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
-        assert.equal(device.geofences.length, 11)
-        assert.equal(device.geofences[0].inTime.fixTime, '2022-04-25T23:48:05.000+0000')
+        assert.equal(device.geofences.length, 19)
+        assert.equal(device.geofences[0].inTime.fixTime, '2022-04-25T23:47:58.000+0000')
         assert.equal(device.geofences[0].outTime.fixTime, '2022-04-26T07:47:35.000+0000')
-        assert.equal(device.geofences[0].totalTime, '28770')
+        assert.equal(device.geofences[0].totalTime, '28777')
         assert.equal(device.geofences[0].geofenceName, 'Casa João')
-    }, 30000) */
+    }, 30000)
 })

package/src/util/traccar.js

@@ -65,16 +65,15 @@ async function getSummary (traccar, from, to, devices) {
   return result.map(r => r.data).flat()
 }
 
-async function getAllInOne (traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length) {
+async function getAllInOne (traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length, sliceSize= 5) {
   let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
   if (getStops) url += '&type=stops'
   if (getSummary) url += '&type=summary'
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  const sliced = automaticReports.sliceArray(devices, sliceSize)
   const result = []
-  let deviceCount = currentDeviceCount
   for (const chunk of sliced) {
     const requests = chunk.map(d =>
       traccar.axios.get(url + '&' + `deviceId=${d.id}`, {
@@ -82,8 +81,7 @@ async function getAllInOne (traccar, from, to, devices, getRoutes, getTrips, get
         withCredentials: true
       }).then(r => r.data).then(x => {
         console.log('LOADING_MESSAGE:' + d.name)
-        deviceCount = deviceCount + 1
-        console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+        console.log(`PROGRESS_PERC:${currentDeviceCount++ / totalDevices * 100}`)
         return x
       }))
     result.push(...(await Promise.all(requests)))

package/src/zone-report.js

@@ -9,7 +9,7 @@ const {getUserPartner} = require("fleetmap-partners")
 const {devicesToProcess} = require("./util/device")
 const traccarHelper = require("./util/traccar")
 const pointToLineDistance = require("@turf/point-to-line-distance")
-const pointOnFeature = require("@turf/point-on-feature")
+const booleanPointInPolygon = require("@turf/boolean-point-in-polygon")
 const distance = require("@turf/distance")
 
 const fileName = 'ZoneReport'
@@ -58,7 +58,7 @@ async function createZoneReport(from, to, userData, traccar) {
 
     let deviceCount = 0
     for(const slice of sliced) {
-        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
+        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length, 20)
         const routeData = allInOne.route
 
         const data = getInAndOutEvents(slice, routeData, userData)
@@ -161,7 +161,7 @@ function getInAndOutEvents(devices, route, userData) {
         routePoints.forEach(p => {
             geofencesFeatures.forEach(g => {
                 if(g.geometry.type === 'Polygon') {
-                    if (pointOnFeature(p, g)) {
+                    if (booleanPointInPolygon.default(p, g)) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)
@@ -175,7 +175,7 @@ function getInAndOutEvents(devices, route, userData) {
                     }
                 }
                 if(g.geometry.type === 'Point') {
-                    if (distance(p, g, {units: 'meters'}) < g.properties.distance) {
+                    if (distance.default(p, g, {units: 'meters'}) < g.properties.distance) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)
@@ -189,7 +189,7 @@ function getInAndOutEvents(devices, route, userData) {
                     }
                 }
                 if(g.geometry.type === 'LineString') {
-                    if (pointToLineDistance(p, g,{units: 'meters'}) < (g.properties.geofence.attributes.polylineDistance || 25)) {
+                    if (pointToLineDistance.default(p, g,{units: 'meters'}) < (g.properties.geofence.attributes.polylineDistance || 25)) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)