fleetmap-reports 1.0.898 → 1.0.899

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -144,7 +144,7 @@ function getDeviceData (allInOne, d) {
       ? 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)
     const economicDistance = economicRPMSections.map(a => a.length > 1
-      ? calculateDistance(a)
+      ? calculateDistance(a, d.attributes['report.ignoreOdometer'])
       : 0).reduce((a, b) => a + b, 0)
     const economicConsumption = economicRPMSections.map(a => a.length > 1
       ? a[a.length - 1].attributes.fuelUsed - a[0].attributes.fuelUsed

package/src/util/trips.js

@@ -120,7 +120,7 @@ function calculateTrip (device, route) {
   return {
     deviceId: device.id,
     deviceName: device.name,
-    distance: calculateDistance(route) * 1000,
+    distance: calculateDistance(route, device.attributes['report.ignoreOdometer']) * 1000,
     averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
     maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
     spentFuel: 0,

package/src/util/utils.js

@@ -241,7 +241,11 @@ exports.getLogo = (user) => {
 }
 exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature
-exports.calculateDistance = (positions) => {
+exports.calculateDistance = (positions, ignoreOdometer) => {
+  if (!ignoreOdometer && positions.length > 1 && positions[0].attributes.odometer && positions[positions.length - 1].attributes.odometer) {
+    return (positions[positions.length - 1].attributes.odometer - positions[0].attributes.odometer) / 1000
+  }
+
   return positions
     .sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
     .map(p => [p.longitude, p.latitude])

package/src/zone-report.js

@@ -93,7 +93,7 @@ async function processDevices (from, to, devices, userData, data) {
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
-    const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to).filter(d => !userData.onlyWithStop || d.stopped)
+    const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)
 
     if (userData.groupByDay || userData.zonesByColumn) {
       const dates = getDates(from, to, userData.user.attributes.timezone)
@@ -115,8 +115,8 @@ async function processDevices (from, to, devices, userData, data) {
           const lastOut = zoneInOutDayData.slice().reverse().find(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
 
           const timeIn = calculateTimeIn(zoneInOutDayData, fromByDay, from, toByDay, to)
-          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to)
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, dayRoute, fromByDay, toByDay, 'distanceOut')
+          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to, d)
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, dayRoute, fromByDay, toByDay, 'distanceOut', d)
 
           dataByDay.push({
             date,
@@ -265,7 +265,7 @@ function getAnyNextIn (outDate, alerts, deviceRoute) {
       new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
 }
 
-function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to) {
+function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay, toByDay, to, device) {
   let distanceIn = zoneInOutDayData.length && dayRoute.length ? zoneInOutDayData.reduce((a, b) => a + (b.distanceIn || 0), 0) : 0
 
   if (zoneInOutDayData.length) {
@@ -273,21 +273,21 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
     if (!zoneInOutDayData[0].inTime || new Date(zoneInOutDayData[0].inTime.fixTime) < fromByDay) {
       const routeDayBefore = deviceRoute.filter(p => (!zoneInOutDayData[0].inTime || (new Date(p.fixTime) >= new Date(zoneInOutDayData[0].inTime.fixTime))) &&
           new Date(p.fixTime) < fromByDay)
-      distanceIn = distanceIn - calculateDistance(routeDayBefore)
+      distanceIn = distanceIn - calculateDistance(routeDayBefore, device.attributes['report.ignoreOdometer'])
     }
 
     // Check if the last entry ends only on the next day
     if (!zoneInOutDayData[zoneInOutDayData.length - 1].outTime || new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) > toByDay) {
       const outTime = zoneInOutDayData[zoneInOutDayData.length - 1].outTime ? new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) : to
       const routeDayAfter = deviceRoute.filter(p => new Date(p.fixTime) < outTime && new Date(p.fixTime) > toByDay)
-      distanceIn = distanceIn - calculateDistance(routeDayAfter)
+      distanceIn = distanceIn - calculateDistance(routeDayAfter, device.attributes['report.ignoreOdometer'])
     }
   }
 
   return distanceIn
 }
 
-function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field) {
+function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
     let distanceOut = zoneInOutDayData.reduce((a, b) => a + (b[field] || 0), 0) -
         (zoneInOutDayData[zoneInOutDayData.length - 1][field] || 0)
@@ -298,23 +298,23 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
           new Date(p.fixTime).getTime() >= fromByDay.getTime()
       )
-      distanceOut = distanceOut + calculateDistance(routeOut)
+      distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay) {
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
           new Date(p.fixTime) < toByDay.getTime())
-      distanceOut = distanceOut + calculateDistance(routeOut)
+      distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     return distanceOut
   }
 
-  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay))
+  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay), device.attributes['report.ignoreOdometer'])
 }
 
-function analyseAlerts (alerts, deviceRoute, userData, from, to) {
+function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
   const zoneInOutData = []
   const zoneInData = {}
 
@@ -338,14 +338,14 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         new Date(p.fixTime).getTime() < nextIn
       )
       const totalOutTime = nextIn - outDate
-      const distanceOut = calculateDistance(routeAfterOut)
+      const distanceOut = calculateDistance(routeAfterOut, device.attributes['report.ignoreOdometer'])
 
       const anyNextIn = getAnyNextIn(outDate, alerts, deviceRoute)
       const routeAfterOutAndBeforeAnyNextIn = deviceRoute.filter(p =>
         new Date(p.fixTime).getTime() >= outDate &&
-          new Date(p.fixTime).getTime() < anyNextIn
+          new Date(p.fixTime).getTime() <= anyNextIn
       )
-      const distanceOutAny = Object.keys(zoneInData).length < 2 ? Math.round(calculateDistance(routeAfterOutAndBeforeAnyNextIn)) : 0
+      const distanceOutAny = Object.keys(zoneInData).length < 2 ? Math.round(calculateDistance(routeAfterOutAndBeforeAnyNextIn, device.attributes['report.ignoreOdometer'])) : 0
 
       if (zoneInData[a.geofenceId]) {
         const totalInTime = new Date(a.position.fixTime).getTime() - new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
@@ -359,7 +359,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
           outTime: a.position,
           totalInTime,
           totalOutTime,
-          distanceIn: calculateDistance(routeIn),
+          distanceIn: calculateDistance(routeIn, device.attributes['report.ignoreOdometer']),
           distanceOut,
           distanceOutAny,
           geofenceName: geofence.name,
@@ -380,7 +380,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
           geofenceId: geofence.id,
           totalInTime,
           totalOutTime,
-          distanceIn: calculateDistance(routeIn),
+          distanceIn: calculateDistance(routeIn, device.attributes['report.ignoreOdometer']),
           driverName: '',
           distanceOut,
           distanceOutAny
@@ -401,7 +401,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         zoneInOutData.push({
           inTime: zoneInData[i].position,
           totalInTime,
-          distanceIn: calculateDistance(routeIn),
+          distanceIn: calculateDistance(routeIn, device.attributes['report.ignoreOdometer']),
           geofenceName: geofence.name,
           geofenceId: geofence.id,
           driverName: zoneInData[i].position.driverName
@@ -413,8 +413,8 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
   if (!zoneInOutData.length && userData.groupByDay) {
     const geofenceIn = alerts.find(a => a.type === 'geofenceIn')
     zoneInOutData.push({
-      distanceIn: geofenceIn ? calculateDistance(deviceRoute) : 0,
-      distanceOut: !geofenceIn ? calculateDistance(deviceRoute) : 0,
+      distanceIn: geofenceIn ? calculateDistance(deviceRoute, device.attributes['report.ignoreOdometer']) : 0,
+      distanceOut: !geofenceIn ? calculateDistance(deviceRoute, device.attributes['report.ignoreOdometer']) : 0,
       totalTime: to.getTime() - from.getTime()
     })
   }