fleetmap-reports 2.0.139 → 2.0.141

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -7,7 +7,7 @@ const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('../util/pdfDocument')
 const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
-const { getRoadSpeedLimits } = require('../speeding-report')
+const { getOverspeedEvents } = require('../speeding-report')
 const { calculateConsumption } = require('../util/fuel')
 const { getCanAvgConsumption } = require('../fuel-consumption-report')
 
@@ -49,25 +49,30 @@ async function create (from, to, userData, traccar) {
 
   const drivers = userData.drivers
   const devices = userData.devices
+  userData.geofences = []
+  userData.roadSpeedLimits = true
 
   let deviceCount = 0
   const driversData = new Map()
+  const overspeedEvents = await getOverspeedEvents(from, to, userData, devices, userData, traccar)
+
   for (const device of devices) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [device], true, true, false, false, deviceCount, devices.length)
-    const hereResults = await getRoadSpeedLimits([device], allInOne.route, 5)
-
-    // getEvents
-    const geofenceAlarm = 0
-    const continuesDrivingAlarm = 0
-    const reverseAlarm = 0
-    const otherAlarm = 0
+    const deviceOverspeedEvents = overspeedEvents.find(e => e.device.id === device.id)
+    const { data } = await traccar.reports.reportsEventsGet(from, to, [device.id], null, ['alarm'])
 
     for (const d of drivers) {
       const { trips, route } = await getDriverData(d, allInOne, userData)
-      const positionIds = route.map(p => p.id)
-      const driverOverSpeedEvents = hereResults.filter(e => positionIds.includes(e.positionId))
+      const positionsIds = route.map(p => p.id)
+      const events = data.filter(e => positionsIds.includes(e.positionId))
+      const driverOverSpeedEvents = deviceOverspeedEvents ? deviceOverspeedEvents.alerts.filter(e => positionsIds.includes(e.position.id)) : []
       const spentFuel = calculateConsumption(device, { trips, route })
 
+      const geofenceAlarm = events.filter(e => e.attributes.alarm === 'la ceinture').length
+      const continuesDrivingAlarm = events.filter(e => e.attributes.alarm === 'Conduite continue').length
+      const reverseAlarm = events.filter(e => e.attributes.alarm === 'MARCHE ARIERRE').length
+      const otherAlarm = events.length - (geofenceAlarm + continuesDrivingAlarm + reverseAlarm)
+
       let driverData = driversData.get(d.id)
       if (!driverData) {
         driverData = {

package/src/speeding-report.js

@@ -79,20 +79,13 @@ function processServerSide () {
   return (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server')
 }
 
-async function createSpeedingReportByDevice (from, to, userData, traccarInstance) {
-  const devices = devicesToProcess(userData)
-
-  const allData = {
-    devices: [],
-    xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
-  }
-
+async function getOverspeedEvents (from, to, userData, devices, allData, traccarInstance) {
   const _sliced = automaticReports.sliceArray(automaticReports.sliceArray(devices, 5), 5)
-
   let deviceCount = 0
+  const overspeedEvents = []
   for (const sliced of _sliced) {
     await Promise.all(sliced.map(async slice => {
-      allData.devices = allData.devices.concat(await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length))
+      overspeedEvents.push(...await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length))
       deviceCount = deviceCount + slice.length
       if (processServerSide()) {
         console.log('LOADING_MESSAGE:' + slice[0].name)
@@ -100,6 +93,18 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
       }
     }))
   }
+  return overspeedEvents
+}
+
+async function createSpeedingReportByDevice (from, to, userData, traccarInstance) {
+  const devices = devicesToProcess(userData)
+
+  const allData = {
+    devices: [],
+    xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
+  }
+
+  allData.devices = await getOverspeedEvents(from, to, userData, devices, allData, traccarInstance)
 
   return allData
 }
@@ -351,7 +356,7 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
           lon: p.longitude,
           lat: p.latitude
         }))
-      }, { timeout: 10000 })
+      }, { timeout: 50000 })
       .then(r => r.data)
     countSuccess++
     lastSuccessDuration = new Date() - now
@@ -703,4 +708,4 @@ exports.exportSpeedingReportToExcel = exportSpeedingReportToExcel
 exports.create = createSpeedingReport
 exports.exportToPDF = exportSpeedingReportToPDF
 exports.exportToExcel = exportSpeedingReportToExcel
-exports.getEvents = getEvents
+exports.getOverspeedEvents = getOverspeedEvents

package/src/util/utils.js

@@ -320,7 +320,7 @@ exports.convertFromUTCDate = (value, user) => {
   return convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
 }
 
-exports.getCountry = position => position && position.attributes.address && position.attributes.address.split(',').slice(-1)[0].trim()
+exports.getCountry = position => position && position.address && position.address.split(',').slice(-1)[0].trim()
 
 exports.processServerSide = (userData) => {
   const devices = devicesToProcess(userData)