fleetmap-reports 2.0.46 → 2.0.48

package/package.json

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

package/src/activity-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('./automaticReports')
 const {
   convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide,
-  getLanguage
+  getLanguage, executeServerSide
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -75,17 +75,6 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
-async function executeServerSide (allData, sliced, from, to, userData, totalDevices, { axios }) {
-  let deviceCount = 0
-  for (const devices of sliced) {
-    const url = `https://${process.env.SERVER_HOST}/reports/activity-report`
-    const data = await axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => d.data)
-    allData.devices.push(...(data[0].devices))
-    deviceCount = deviceCount + devices.length
-    console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
-  }
-}
-
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
   console.log('createActivityReportByDevice')
   const allDevices = devicesToProcess(userData)
@@ -99,7 +88,9 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 
   if (isClientSide() && allDevices.length > 20) {
     const sliced = automaticReports.sliceArray(allDevices, 10)
-    await executeServerSide(allData, sliced, from, to, userData, allDevices.length, traccarInstance)
+    await executeServerSide('activity-report', sliced, from, to, userData, allDevices.length, traccarInstance, 5).then(devices => {
+      allData.devices = devices
+    })
   } else {
     let summaryByDay = []
     if (userData.allWeek && userData.groupByDay) {

package/src/speeding-report.js

@@ -385,7 +385,7 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
 }
 
 async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
-  const chunk = 300
+  const chunk = 200
   const events = []
   for (const d of devices) {
     const route = routes.filter(r => r.deviceId === d.id)

package/src/util/utils.js

@@ -243,11 +243,13 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
           userData: userData.byDriver
             ? {
                 ...userData,
-                drivers: items
+                drivers: items,
+                geofences: []
               }
             : {
                 ...userData,
-                devices: items
+                devices: items,
+                geofences: []
               }
         }, { withCredentials: true }).then(d => d.data)
         reportData.push(...(userData.byDriver ? data[0].drivers : data[0].devices))