fleetmap-reports 1.0.422 → 1.0.423

package/package.json

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

package/src/trip-report.js

@@ -10,7 +10,6 @@ const trips = require('./util/trips')
 const { isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
-const axios = require('axios')
 
 const fileName = 'TripReport'
 
@@ -60,7 +59,7 @@ async function createTripReportByDevice (from, to, userData, traccar) {
         trips: tripsData,
         stops: stopsData,
         route: routeData
-      }, userData))
+      }, userData, traccar))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -122,7 +121,7 @@ async function createTripReportByDriver (from, to, userData, traccar) {
   return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
 }
 
-function processDevices (from, to, devices, data, userData) {
+function processDevices (from, to, devices, data, userData, traccar) {
   const devicesResult = []
 
   devices.forEach(d => {
@@ -159,7 +158,8 @@ function processDevices (from, to, devices, data, userData) {
         trip.stopEngineHours = 0
       }
       if (trip.endAddress === null) {
-        axios.get(`https://main.d8z8k71nd7w8x.amplifyapp.com/?${trip.endLat},${trip.endLon}`).then(r => { trip.endAddress = r.data })
+        traccar.axios.get(`/server/geocode?latitude=${trip.latitude}&longitude=${trip.longitude}`)
+          .then(d => { trip.endAddress = d.data })
       }
     })