fleetmap-reports 2.0.218 → 2.0.220

package/package.json

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

package/src/util/route.js

@@ -70,4 +70,5 @@ function filterPosition (p) {
 
 exports.getIdleEvents = getIdleEvents
 exports.filterPositions = filterPositions
+exports.filterPosition = filterPosition
 exports.cleanPositon = cleanPosition

package/src/util/traccar.js

@@ -2,6 +2,7 @@ const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 const path = require('path')
 const Piscina = require('piscina')
+const {cleanPositions, filterPositions, filterPosition} = require("./route");
 const piscina = new Piscina()
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
@@ -75,7 +76,12 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
       ? await streamJson(traccar, u.replace('allinone', 'route'), filter)
       : await traccar.axios.get(u, {
         withCredentials: true
-      }).then(r => r.data)
+      }).then(r => {
+        if (filter && r.data.route) {
+          r.data.route = cleanPositions(r.data.route.filter(filterPosition))
+        }
+        return r.data
+      })
 
     console.log('LOADING_MESSAGE:' + _chunk[0].name)
     if (counter) {
@@ -120,7 +126,8 @@ async function getAllInOne (
   sliceSize = 5,
   devicesPerRequest = 1,
   counter = undefined,
-  ignorePercentage = false) {
+  ignorePercentage = false,
+  filter) {
   let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
@@ -136,7 +143,7 @@ async function getAllInOne (
       console.log(u)
       requests.push(
         getItems(traccar, u, _chunk, counter, devicesPerRequest, ignorePercentage, totalDevices, currentDeviceCount,
-          !getTrips && !getStops && !getSummary)
+          !getTrips && !getStops && !getSummary, filter)
       )
     }
     const now = new Date()

package/src/util/traccar.worker.js

@@ -3,7 +3,7 @@ const { parser } = require('stream-json')
 const { pick } = require('stream-json/filters/Pick')
 const { streamArray } = require('stream-json/streamers/StreamArray')
 const { Readable } = require('stream')
-const { cleanPosition } = require('./route')
+const { cleanPosition, filterPosition } = require('./route')
 
 module.exports = async ({ url, cookie, filter }) => {
   const now = new Date()
@@ -23,8 +23,15 @@ module.exports = async ({ url, cookie, filter }) => {
       parser(),
       streamArray() // Stream each item in the array
     ])
-    pipeline.on('data', ({ value }) => result.route.push(
-      filter ? cleanPosition(value) : value))
+    pipeline.on('data', ({ value }) => {
+      if (filter) {
+        if (filterPosition(value)) {
+          result.route.push(cleanPosition(value))
+        }
+      } else {
+        result.route.push(value)
+      }
+    })
     pipeline.on('end', () => resolve(result))
     pipeline.on('error', reject)
   })

package/src/zone-report.js

@@ -30,9 +30,9 @@ const fileName = 'ZoneReport'
 async function process (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) {
   const data = await traccarHelper.getAllInOne(
     traccar, from, to, slice, true, false, false, false,
-    deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined, filterPositions)
+    deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined, false, true)
 
-  const route = filterPositions(data.route)
+  const route = data.route
   const alerts = []
   if (isClientSide()) {
     alerts.push(...(await getInAndOutEvents(slice, cleanPositions(route), userData)))