fleetmap-reports 2.0.136 → 2.0.138

package/package.json

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

package/src/fuel-consumption-report.js

@@ -276,3 +276,4 @@ exports.exportFuelConsumptionReportToExcel = exportFuelConsumptionReportToExcel
 exports.create = createFuelConsumptionReport
 exports.exportToPDF = exportFuelConsumptionReportToPDF
 exports.exportToExcel = exportFuelConsumptionReportToExcel
+exports.getCanAvgConsumption = getCanAvgConsumption

package/src/partnerReports/driverranking-report.js

@@ -7,6 +7,30 @@ 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 { calculateConsumption } = require('../util/fuel')
+const { getCanAvgConsumption } = require('../fuel-consumption-report')
+
+const distanceTarget = 10000 // meters
+const distanceCoefficient = 0.9
+
+const consumptionTarget = 11.5 // minutes
+const consumptionCoefficient = 0.13
+
+const rpmTarget = 60 // minutes
+const rpmCoefficient = 0.13
+
+const hardBrakingTarget = 1
+const hardBrakingCoefficient = 0.15
+
+const hardAccelerationTarget = 1
+const hardAccelerationCoefficient = 0.15
+
+const hardCorneringTarget = 1
+const hardCorneringCoefficient = 0.15
+
+const overspeedTarget = 2
+const overspeedCoefficient = 0.2
 
 async function create (from, to, userData, traccar) {
   const reportData = []
@@ -18,9 +42,13 @@ async function create (from, to, userData, traccar) {
   const driversData = new Map()
   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)
 
     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 spentFuel = calculateConsumption(d, { trips, route })
 
       let driverData = driversData.get(d.id)
       if (!driverData) {
@@ -30,7 +58,9 @@ async function create (from, to, userData, traccar) {
           highEngineRPM: 0,
           hardBraking: 0,
           hardAcceleration: 0,
-          hardCornering: 0
+          hardCornering: 0,
+          overspeed: 0,
+          spentFuel: 0
         }
         driversData.set(d.id, driverData)
       }
@@ -61,6 +91,8 @@ async function create (from, to, userData, traccar) {
       driverData.hardBraking = driverData.hardBraking + hardBraking
       driverData.hardAcceleration = driverData.hardAcceleration + hardAcceleration
       driverData.hardCornering = driverData.hardCornering + hardCornering
+      driverData.overspeed = driverData.overspeed + driverOverSpeedEvents.length
+      driverData.spentFuel = driverData.spentFuel + spentFuel
     }
 
     deviceCount++
@@ -68,7 +100,16 @@ async function create (from, to, userData, traccar) {
 
   const allDriversData = (Array.from(driversData.values())).filter(d => d.distance > 0)
   allDriversData.forEach(d => {
-    d.score = (d.highEngineRPM + d.hardBraking + d.hardAcceleration + d.hardCornering) / (d.distance / 1000)
+    const distanceScore = (Math.abs(d.distance - distanceTarget) / distanceTarget) * distanceCoefficient
+    const rpmScore = ((d.highEngineRPM / 60000) / rpmTarget) * rpmCoefficient
+    const hardBrakingScore = (d.hardBraking / hardBrakingTarget) * hardBrakingCoefficient
+    const hardAccelerationScore = (d.hardAcceleration / hardAccelerationTarget) * hardAccelerationCoefficient
+    const hardCorneringScore = (d.hardCornering / hardCorneringTarget) * hardCorneringCoefficient
+    const overspeedScore = (d.overspeed / overspeedTarget) * overspeedCoefficient
+    const consumptionScore = (getCanAvgConsumption(d.distance, d.spentFuel).byKms / consumptionTarget) * consumptionCoefficient
+
+    d.avgConsumption = getCanAvgConsumption(d.distance, d.spentFuel).byKms
+    d.score = distanceScore + rpmScore + hardBrakingScore + hardAccelerationScore + hardCorneringScore + consumptionScore + overspeedScore
   })
   allDriversData.sort((a, b) => (a.score > b.score) ? 1 : -1)