fleetmap-reports 2.0.386 → 2.0.387

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -209,7 +209,7 @@ function calculateRPMSections (route, min, max) {
   let newSection = true
   route.forEach(p => {
     const rpm = p.attributes.rpm
-    if ((!min || rpm > min) && (!max || rpm < max)) {
+    if ((min === undefined || rpm > min) && (!max || rpm < max)) {
       if (newSection) {
         sections.push([p])
       } else {

package/src/rpm-report.js

@@ -10,7 +10,7 @@ const automaticReports = require('./automaticReports')
 const { calculateRPMSections } = require('./partnerReports/performance-report')
 
 const fileName = 'RPMReport'
-const defaultThreshold = 2500
+const defaultThreshold = 0
 
 async function createRPMReport (from, to, userData, traccarInstance) {
   console.log('Create RPMReport', from, to)
@@ -23,6 +23,7 @@ async function createRPMReport (from, to, userData, traccarInstance) {
   }
 
   const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  const threshold = getThreshold(userData)
 
   let deviceCount = 0
   const sliced = automaticReports.sliceArray(allDevices, 20)
@@ -31,7 +32,7 @@ async function createRPMReport (from, to, userData, traccarInstance) {
     for (const d of devices) {
       const deviceRoute = route.filter(p => p.deviceId === d.id && p.attributes.rpm !== undefined)
       if (deviceRoute.length) {
-        allData.devices.push(processDevice(d, deviceRoute, dates))
+        allData.devices.push(processDevice(d, deviceRoute, dates, threshold))
       }
     }
     deviceCount += devices.length
@@ -40,8 +41,10 @@ async function createRPMReport (from, to, userData, traccarInstance) {
   return [allData]
 }
 
-function getThreshold (device) {
-  return Number(device.attributes.highRPM) || defaultThreshold
+// the report's own threshold (userData.rpmThreshold), independent of the device highRPM attribute used by other reports
+function getThreshold (userData) {
+  const threshold = Number(userData.rpmThreshold)
+  return userData.rpmThreshold !== undefined && userData.rpmThreshold !== '' && Number.isFinite(threshold) ? threshold : defaultThreshold
 }
 
 function dayKey (date) {
@@ -49,8 +52,7 @@ function dayKey (date) {
 }
 
 // time between consecutive positions that are both above the threshold, attributed to the day of the first one
-function processDevice (device, deviceRoute, dates) {
-  const threshold = getThreshold(device)
+function processDevice (device, deviceRoute, dates, threshold = defaultThreshold) {
   const days = dates.map(date => ({ date, time: 0 }))
   calculateRPMSections(deviceRoute, threshold).forEach(section => {
     for (let i = 1; i < section.length; i++) {

package/src/tests/rpm.test.js

@@ -17,17 +17,28 @@ describe('RPM_Report', function () {
     position(new Date(2026, 9, 2, 9, 0), 2600),
     position(new Date(2026, 9, 2, 9, 0, 30), 2600)
   ]
-  it('sums time above the default threshold per day', () => {
-    const result = processDevice({ id: 1, attributes: {} }, route, dates)
+  it('sums time above the threshold per day', () => {
+    const result = processDevice({ id: 1, attributes: {} }, route, dates, 2500)
     assert.equal(result.threshold, 2500)
     assert.equal(result.days[0].time, 3 * 60 * 1000)
     assert.equal(result.days[1].time, 30 * 1000)
     assert.equal(result.time, 3 * 60 * 1000 + 30 * 1000)
   })
-  it('uses the device highRPM attribute as threshold', () => {
-    const result = processDevice({ id: 1, attributes: { highRPM: 2650 } }, route, dates)
-    assert.equal(result.threshold, 2650)
-    assert.equal(result.days[0].time, 2 * 60 * 1000)
-    assert.equal(result.days[1].time, 0)
+  it('ignores the device highRPM attribute', () => {
+    const result = processDevice({ id: 1, attributes: { highRPM: 2650 } }, route, dates, 2500)
+    assert.equal(result.threshold, 2500)
+    assert.equal(result.days[0].time, 3 * 60 * 1000)
+  })
+  it('defaults to rpm > 0 (engine running time)', () => {
+    const idleRoute = [
+      position(new Date(2026, 9, 1, 8, 0), 0),
+      position(new Date(2026, 9, 1, 8, 10), 800),
+      position(new Date(2026, 9, 1, 8, 20), 2000),
+      position(new Date(2026, 9, 1, 8, 30), 0),
+      position(new Date(2026, 9, 1, 8, 40), 0)
+    ]
+    const result = processDevice({ id: 1, attributes: {} }, idleRoute, dates)
+    assert.equal(result.threshold, 0)
+    assert.equal(result.days[0].time, 10 * 60 * 1000)
   })
 })