fleetmap-reports 2.0.114 → 2.0.116

package/package.json

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

package/src/kms-report.js

@@ -9,7 +9,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const driversUtil = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData, reportByDriver } = require('./util/driver')
 const automaticReports = require('./automaticReports')
@@ -87,7 +87,6 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
         // Process report data
         if (trips.length) {
-          checkTripsKms(traccarInstance, from, to, devices, { trips, route })
           allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
             trips,
             route
@@ -161,7 +160,6 @@ async function createKmsReportByGroup (from, to, userData, traccarInstance) {
       console.log('trips:' + tripsData.length)
 
       if (tripsData.length > 0) {
-        checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route })
         groupData.devices = await processDevices(from, to, devices, { trips: tripsData, route }, userData, traccarInstance)
       }
 

package/src/trip-report.js

@@ -9,7 +9,6 @@ const { getUserPartner } = require('fleetmap-partners')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const traccarHelper = require('./util/traccar')
-const trips = require('./util/trips')
 const {
   isInsideTimetable, isPartialInsideTimetable, getTripIdleTime, calculateStopDuration,
   getUncompletedTrip, getTripTotalKms
@@ -61,7 +60,6 @@ async function createTripReportByDevice (from, to, userData, traccar) {
     console.log('Trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-      trips.checkTripsKms(traccar, from, to, slice, { trips: tripsData, route: routeData })
       allData.devices.push(...await processDevices(from, to, slice, {
         trips: tripsData,
         stops: stopsData,
@@ -177,7 +175,7 @@ async function processDevices (from, to, devices, data, userData, traccar) {
     trips.forEach(trip => {
       const stop = getStop(new Date(trip.startTime), stops)
 
-      trip.totalKms = getTripTotalKms(trip, stop)
+      trip.totalKms = getTripTotalKms(trip, stop, deviceRoute)
 
       const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
       if (nearestPOIs.length > 0) {

package/src/util/trips.js

@@ -2,35 +2,6 @@ const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isCli
 const { isInside } = require('./timetable')
 const traccarHelper = require('./traccar')
 
-const minDistance = 0
-const minAvgSpeed = 0
-
-function checkTripsKms (traccarInstance, from, to, devices, data) {
-  const trips = data.trips.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
-  if (trips.length > 0) {
-    // Vehicles with imported positions. calculate trip distance with route positions
-    trips.forEach(t => {
-      if (t.distance === minDistance && t.averageSpeed > minAvgSpeed && data.route.find(p => p.source === 'import')) {
-        const tripRoute = data.route.filter(p => p.deviceId === t.deviceId &&
-                    new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime() &&
-                    new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
-
-        let current = null
-        const distances = []
-        for (const p of tripRoute) {
-          if (current) {
-            distances.push(coordsDistance(parseFloat(current.longitude), parseFloat(current.latitude),
-              parseFloat(p.longitude), parseFloat(p.latitude)))
-          }
-          current = p
-        }
-
-        t.distance = distances.reduce((a, b) => a + b, 0)
-      }
-    })
-  }
-}
-
 async function calculatePartialTrip (device, startDate, endDate, route, t, traccarInstance) {
   let isPartialInside = false
   const tripStart = new Date(t.startTime)
@@ -217,12 +188,27 @@ function calculateStopDuration (stop) {
   return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
 }
 
-function getTripTotalKms (trip, stop) {
+function getTripTotalKms (trip, stop, route) {
   // we need to add stop kms to ensure that the total kms for the day, calculated with the odometer difference, will be equal to the sum of kms of all trips
-  return (trip.distance + (stop ? (stop.endOdometer - stop.startOdometer) : 0)) / 1000
+  let distance = trip.distance + (stop ? (stop.endOdometer - stop.startOdometer) : 0)
+  if (!trip.distance && route && route.length) {
+    distance = 0
+    const positions = route.filter(p => p.deviceId === trip.deviceId &&
+      new Date(p.fixTime).getTime() >= new Date(trip.startTime).getTime() &&
+      new Date(p.fixTime).getTime() <= new Date(trip.endTime).getTime())
+
+    let current = null
+    for (const p of positions) {
+      if (current) {
+        distance += coordsDistance(parseFloat(current.longitude), parseFloat(current.latitude),
+          parseFloat(p.longitude), parseFloat(p.latitude))
+      }
+      current = p
+    }
+  }
+  return distance / 1000
 }
 
-exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.getDataByDay = getDataByDay