fleetmap-reports 2.0.220 → 2.0.222

package/package.json

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

package/src/tests/index.js

@@ -9,7 +9,7 @@ const traccarConfig = {
   }
 }
 const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: traccarConfig.basePath })
-
+process.env.TRACCAR_API_REPORTS = 'https://ltqgfyvcklxzaonv7h4rlmghai0rszop.lambda-url.us-east-1.on.aws/api'
 const getReports = async (email, password) => {
   try {
     email = email || process.env.email

package/src/util/route.js

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

package/src/util/traccar.js

@@ -2,7 +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 { cleanPositions, filterPosition } = require('./route')
 const piscina = new Piscina()
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
@@ -73,7 +73,7 @@ async function getItems (traccar, u, _chunk, counter, devicesPerRequest, ignoreP
   totalDevices, currentDeviceCount, routeOnly, filter) {
   try {
     const x = routeOnly && !isClientSide()
-      ? await streamJson(traccar, u.replace('allinone', 'route'), filter)
+      ? await streamJson(traccar, u.replace('allinone', 'route').replace('type=route', ''), filter)
       : await traccar.axios.get(u, {
         withCredentials: true
       }).then(r => {
@@ -107,8 +107,7 @@ function streamJson (traccar, u, filter) {
     filter
   },
   {
-    filename: path.resolve(__dirname, './traccar.worker.js'),
-    maxThreads: require('os').cpus().length
+    filename: path.resolve(__dirname, './traccar.worker.js')
   })
 }
 

package/src/util/traccar.worker.js

@@ -1,6 +1,5 @@
 const { chain } = require('stream-chain')
 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, filterPosition } = require('./route')

package/src/zone-report.js

@@ -16,14 +16,13 @@ const {
 } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const {
-  filterPositions,
   cleanPositions
 } = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 10
+const sliceSize = 5
 const deviceChunk = 5
 const fileName = 'ZoneReport'