fleetmap-reports 2.0.345 → 2.0.347

package/package.json

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

package/src/fuel-consumption-report.js

@@ -7,7 +7,7 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
 const jsPDF = require('jspdf')
-const { calculateConsumption } = require('./util/fuel')
+const { calculateConsumption, calculateTotalFuelFromSensor} = require('./util/fuel')
 const { getSummaryByDay } = require('./util/traccar')
 const { getDataByDay } = require('./util/trips')
 
@@ -53,8 +53,16 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
         const summaryByDay = summary.find(a => a.date === date).summary
         const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
 
+        const firstStopIndex = !stopsByDay.length || !tripsByDay.length ? 0 : (new Date(tripsByDay[0].startTime) < new Date(stopsByDay[0].startTime) ? 0 : 1)
         const distance = summaryByDevice.distance
-        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
+
+        const hasFuelSensor = 'fuel_low_threshold' in d.attributes &&
+            'fuel_high_threshold' in d.attributes &&
+            d.attributes.fuel_tank_capacity
+
+        const spentFuel = hasFuelSensor ?
+            tripsByDay.length > 0 ? calculateTotalFuelFromSensor(tripsByDay, stopsByDay, route, d, firstStopIndex) : 0
+            : calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
 
         const dataRow = {
           date,

package/src/util/fuel.js

@@ -9,14 +9,61 @@ function getRefuelingLiters (d, position, diff) {
   return Math.round(diff * d.attributes.fuel_tank_capacity / 100)
 }
 
+function calculateTotalFuelFromSensor(trips, stops, positions, device, firstStopIndex) {
+  const lastStopIndex = firstStopIndex + trips.length - 1
+  const lastStop = stops.length > lastStopIndex ? stops[lastStopIndex] : null
+  const firstTripStart = new Date(trips[0].startTime).getTime()
+  const lastEndTime = lastStop ? new Date(lastStop.endTime).getTime() : new Date(trips[trips.length - 1].endTime).getTime()
+
+  const rangePositions = positions.filter(p => {
+    const t = new Date(p.fixTime).getTime()
+    return t >= firstTripStart && t <= lastEndTime && p.attributes.fuel != null
+  })
+
+  if (rangePositions.length < 2) return 0
+
+  const invertedSensor = device.attributes.fuel_low_threshold > device.attributes.fuel_high_threshold
+  const sensorRange = Math.abs(device.attributes.fuel_high_threshold - device.attributes.fuel_low_threshold)
+  const refuelThreshold = sensorRange * 0.2
+
+  let totalRawConsumption = 0
+  let segmentStartFuel = rangePositions[0].attributes.fuel
+
+  for (let i = 1; i < rangePositions.length; i++) {
+    const prev = rangePositions[i - 1]
+    const curr = rangePositions[i]
+    // refuel = significant increase for normal sensor, significant decrease for inverted
+    const fuelChange = invertedSensor
+        ? prev.attributes.fuel - curr.attributes.fuel
+        : curr.attributes.fuel - prev.attributes.fuel
+
+    if (fuelChange > refuelThreshold) {
+      const segmentRawDiff = invertedSensor
+          ? prev.attributes.fuel - segmentStartFuel
+          : segmentStartFuel - prev.attributes.fuel
+      if (segmentRawDiff > 0) totalRawConsumption += segmentRawDiff
+      segmentStartFuel = curr.attributes.fuel
+    }
+  }
+
+  const lastFuel = rangePositions[rangePositions.length - 1].attributes.fuel
+  const lastSegmentRawDiff = invertedSensor
+      ? lastFuel - segmentStartFuel
+      : segmentStartFuel - lastFuel
+  if (lastSegmentRawDiff > 0) totalRawConsumption += lastSegmentRawDiff
+
+  if (totalRawConsumption <= 0) return 0
+  return (totalRawConsumption / sensorRange) * device.attributes.fuel_tank_capacity
+}
+
+
 function calculateConsumption (d, data) {
   let fuelConsumption = 0
   const withFuelUsed = data.route && data.route.find(p => p.attributes.fuelUsed)
   if (data.summary && withFuelUsed) {
     fuelConsumption = calculateSpentFuel(data.summary.spentFuel, d, withFuelUsed)
   } else if (data.trips && data.stops) {
-    const spentFuel = data.trips.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0) + data.stops.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0)
-    fuelConsumption = calculateSpentFuel(spentFuel, d, withFuelUsed)
+    fuelConsumption = data.trips.reduce((a, b) => a + calculateSpentFuel(b.spentFuel, d, withFuelUsed), 0) + data.stops.reduce((a, b) => a + calculateSpentFuel(b.spentFuel, d, withFuelUsed), 0)
   } else if (data.route && data.route.length > 1 && data.route[0].attributes.fuelUsed) {
     fuelConsumption = data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed
   } else if (data.summary) {
@@ -41,7 +88,7 @@ function calculateSpentFuel (value, device, withFuelUsed) {
     return rawFuel > 0 ? (rawFuel / sensorRange) * fuel_tank_capacity : 0
   }
 
-  return value
+  return value > 0 ? value : 0
 }
 
 function useOdooFuelData (d, route) {
@@ -52,3 +99,4 @@ exports.calculateFuelDiff = calculateFuelDiff
 exports.getRefuelingLiters = getRefuelingLiters
 exports.calculateConsumption = calculateConsumption
 exports.useOdooFuelData = useOdooFuelData
+exports.calculateTotalFuelFromSensor = calculateTotalFuelFromSensor