fleetmap-reports 2.0.135 → 2.0.137

package/package.json

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

package/src/partnerReports/driverranking-report.js

@@ -41,12 +41,12 @@ async function create (from, to, userData, traccar) {
       let hardCornering = 0
       if (route.find(p => p.attributes.rawXpert)) {
         const xpertMessages = route.map(p => p.attributes.rawXpert).filter(a => a)
-        const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
-        highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
-        hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
-        hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+        const canDriverStyle = getCanDriverStyleMessages(xpertMessages).map(m => parseCanDriverStyleMessage(m))
+        highEngineRPM = canDriverStyle.reduce((a, b) => a + b.totalTimeWithHighRpmAndTorque, 0)
+        hardBraking = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshBrakes, 0)
+        hardAcceleration = canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshAccelerations, 0)
       } else {
-        const highEngineRPMSections = calculateRPMSections(route, d.attributes.highRPM || 1300)
+        const highEngineRPMSections = calculateRPMSections(route, d.attributes.highRPM || 1500)
         highEngineRPM = highEngineRPMSections.map(a => a.length > 1
           ? a.map((p, index) => index === 0 ? 0 : new Date(p.fixTime).getTime() - new Date(a[index - 1].fixTime).getTime()).reduce((a, b) => a + b, 0)
           : 0).reduce((a, b) => a + b, 0)
@@ -68,7 +68,7 @@ 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)
+    d.score = ((d.highEngineRPM / 60000) + d.hardBraking + d.hardAcceleration + d.hardCornering) / (d.distance / 1000)
   })
   allDriversData.sort((a, b) => (a.score > b.score) ? 1 : -1)
 

package/src/util/xpert.js

@@ -45,11 +45,11 @@ function parseCanDriverStyleMessage (xpertMessage) {
 }
 
 function getEndTripMessages (xpertMessages) {
-  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '3') : xpert.split(';').find(m => m.startsWith('3')))).filter(a => a)
+  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.split(';').find(m => m.startsWith('3')) : (xpert.startsWith('3') ? xpert : undefined))).flat().filter(a => a)
 }
 
 function getCanDriverStyleMessages (xpertMessages) {
-  return xpertMessages.map(xpert => (Array.isArray(xpert) ? xpert.find(x => x.type === '4') : xpert.split(';').find(m => m.startsWith('4')))).filter(a => a)
+  return xpertMessages.map(xpert => Array.isArray(xpert) ? xpert.split(';').find(m => m.startsWith('4')) : (xpert.startsWith('4') ? xpert : undefined)).flat().filter(a => a)
 }
 
 exports.parseEndTripMessage = parseEndTripMessage