fleetmap-reports 2.0.301 → 2.0.303

package/package.json

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

package/src/location-report.js

@@ -73,7 +73,7 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
 }
 
 async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices, userData, retry = 3) {
-  const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route`
+  const url = 'https://rntba7aqifqx3iywrenb7pq6km0liwsr.lambda-url.us-east-1.on.aws/pinmeapi/process-report/get-driver-route'
   return traccar.axios.post(url, {
     from,
     to,
@@ -189,6 +189,7 @@ async function processDrivers (from, to, userData, data) {
   const result = []
   for (const d of userData.drivers) {
     const { route } = await getDriverData(d, data, userData)
+
     if (route.length > 0) {
       route.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 

package/src/trip-report.js

@@ -222,7 +222,7 @@ async function processDevices (from, to, devices, data, userData, traccar) {
 
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = calculateStopDuration(stop)
-        trip.stopEngineHours = trip.idleTime + stop.engineHours
+        trip.stopEngineHours = trip.idleTime + stop.idleTime
       } else {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
@@ -292,7 +292,7 @@ async function processDrivers (from, to, userData, data) {
           trip.endPOIName = nearestPOIs[0].p.name
         }
 
-        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
+        trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.idleTime : 0)
       })
 
       if (trips.length > 0) {

package/src/util/trips.js

@@ -192,8 +192,8 @@ function getTripIdleTime (trip, idleEvents) {
 
 function calculateStopDuration (stop) {
   const totalStopTime = new Date(stop.endTime) - new Date(stop.startTime)
-  if (totalStopTime < stop.engineHours) return 0
-  return totalStopTime - (stop.engineHours > 0 ? stop.engineHours : 0)
+  if (totalStopTime < stop.idleTime) return 0
+  return totalStopTime - (stop.idleTime > 0 ? stop.idleTime : 0)
 }
 
 const maxDistanceDiff = 10000