fleetmap-reports 1.0.782 → 1.0.783

package/package.json

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

package/src/refueling-report.js

@@ -7,7 +7,7 @@ const odoo = require('./util/odoo')
 const traccarHelper = require('./util/traccar')
 const { calculateFuelDiff, getRefuelingLiters } = require('./util/fuel')
 
-const positionsToCheck = 15
+// const positionsToCheck = 15
 
 async function createRefuelingReport (from, to, userData, traccar) {
   console.log('Create RefuelingReport')
@@ -119,6 +119,86 @@ function coordsDistance (lon1, lat1, lon2, lat2) {
   return distance.default(from, to) * 1000
 }
 
+/* function isStoped (position) {
+  return !position.attributes.ignition || position.attributes.rpm === 0
+} */
+
+/* function analyseRouteRefuelingOnStops (data, d, refuelingPositions) {
+  let refuelingActivated = false
+  let currentValue = null
+  let positionsChecked = 0
+  let lastRefuelingIndex = 0
+  data.route.forEach(function (element, index, array) {
+    if (isStoped(element) && refuelingActivated && !currentValue) {
+      // Ignition is off and Refueling is Active and there is no current value
+
+      // Get 5 position before the ignition off to calculate the current value of the fuel tank level
+      // lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
+      const before = (index > 5 ? array.slice((index - 6 < lastRefuelingIndex ? lastRefuelingIndex : index - 6), index - 1) : array.slice(0, index - 1)).filter(b => b.attributes.ignition && b.attributes.fuel)
+      currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length)
+
+      positionsChecked = 0
+    }
+
+    if (element.attributes.ignition && refuelingActivated && currentValue) {
+      // Ignition is on and Refueling is Active and there is a current value
+      // Calculate the value of the fuel tank level after turning the ignition back on
+      const after = (array.length > index + 5 ? array.slice(index, index + 1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
+      const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length)
+
+      const diff = calculateFuelDiff(currentValue, newValue, d, element)
+      if (diff > 20) {
+        // New refueling detected
+        const value = getRefuelingLiters(d, element, diff)
+        refuelingPositions.push({position: element, date: element.fixTime, diff: value})
+        lastRefuelingIndex = index
+        positionsChecked = positionsToCheck + 1 // to reset values
+      }
+
+      if (positionsChecked > positionsToCheck) {
+        refuelingActivated = false
+        currentValue = null
+        positionsChecked = 0
+      } else {
+        positionsChecked++
+      }
+    }
+
+    if (element.attributes.ignition && !refuelingActivated) {
+      refuelingActivated = true
+    }
+  })
+} */
+
+function analyseRouteRefueling (data, d, refuelingPositions) {
+  let startValue = 0
+  let currentValue = 0
+  let refuelingActivated = false
+  data.route.forEach(function (element, index, array) {
+    if (!refuelingActivated) {
+      startValue = element.attributes.fuel
+    }
+
+    const endValue = array.length > index + 2 ? array[index + 2].attributes.fuel : undefined
+    const diff = calculateFuelDiff(startValue, endValue, d, element)
+
+    if (diff > 5 && !refuelingActivated) {
+      refuelingActivated = true
+      currentValue = diff
+    } else if (refuelingActivated && currentValue <= diff) {
+      currentValue = diff
+    } else {
+      if (currentValue > 20) {
+        // New refueling detected
+        const value = getRefuelingLiters(d, element, currentValue)
+        refuelingPositions.push({ position: element, date: element.fixTime, diff: value })
+        currentValue = 0
+      }
+      refuelingActivated = false
+    }
+  })
+}
+
 async function calculateRefuelingPositions (userData, d, data) {
   const refuelingPositions = []
 
@@ -137,50 +217,8 @@ async function calculateRefuelingPositions (userData, d, data) {
       }
     })
   } else {
-    let refuelingActivated = false
-    let currentValue = null
-    let positionsChecked = 0
-    let lastRefuelingIndex = 0
-    data.route.forEach(function (element, index, array) {
-      if (!element.attributes.ignition && refuelingActivated && !currentValue) {
-        // Ignition is off and Refueling is Active and there is no current value
-
-        // Get 5 position before the ignition off to calculate the current value of the fuel tank level
-        // lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
-        const before = (index > 5 ? array.slice((index - 6 < lastRefuelingIndex ? lastRefuelingIndex : index - 6), index - 1) : array.slice(0, index - 1)).filter(b => b.attributes.ignition && b.attributes.fuel)
-        currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length)
-
-        positionsChecked = 0
-      }
-
-      if (element.attributes.ignition && refuelingActivated && currentValue) {
-        // Ignition is on and Refueling is Active and there is a current value
-        // Calculate the value of the fuel tank level after turning the ignition back on
-        const after = (array.length > index + 5 ? array.slice(index, index + 1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
-        const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length)
-
-        const diff = calculateFuelDiff(currentValue, newValue, d, element)
-        if (diff > 20) {
-          // New refueling detected
-          const value = getRefuelingLiters(d, element, diff)
-          refuelingPositions.push({ position: element, date: element.fixTime, diff: value })
-          lastRefuelingIndex = index
-          positionsChecked = positionsToCheck + 1 // to reset values
-        }
-
-        if (positionsChecked > positionsToCheck) {
-          refuelingActivated = false
-          currentValue = null
-          positionsChecked = 0
-        } else {
-          positionsChecked++
-        }
-      }
-
-      if (element.attributes.ignition && !refuelingActivated) {
-        refuelingActivated = true
-      }
-    })
+    // analyseRouteRefuelingOnStops(data, d, refuelingPositions)
+    analyseRouteRefueling(data, d, refuelingPositions)
   }
   return refuelingPositions
 }