fleetmap-reports 2.0.286 → 2.0.289

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.286",
+  "version": "2.0.289",
   "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 = `${process.env.PINME_FUNCTION_URL}/pinmeapi/process-report/get-driver-route`
+  const url = `https://${process.env.SERVER_HOST}/pinmeapi/process-report/get-driver-route`
   return traccar.axios.post(url, {
     from,
     to,
@@ -86,7 +86,7 @@ async function _getDriverRoute (traccar, from, to, slice, deviceCount, devices,
       if (--retry) {
         return _getDriverRoute(traccar, from, to, slice, deviceCount, devices, userData, retry)
       } else {
-        console.error('giving up', url, slice[0].id, 'after 3 retries', e.message)
+        console.error('giving up', slice[0].id, 'after 3 retries', e.message)
       }
     })
     .then(r => (r && r.data) || [])
@@ -171,32 +171,7 @@ function processDevices (from, to, devices, data) {
   const devicesResult = []
 
   for (const d of devices) {
-    const positions = data.route.filter(t => t.deviceId === d.id)
-
-    const lighterPositions = positions.map(p => {
-      return {
-        id: p.id,
-        fixTime: p.fixTime,
-        address: p.address,
-        speed: p.speed,
-        latitude: p.latitude,
-        longitude: p.longitude,
-        attributes: {
-          driverUniqueId: p.attributes.driverUniqueId,
-          temp1: p.attributes.temp1,
-          temp2: p.attributes.temp2,
-          door1: p.attributes.door1,
-          door2: p.attributes.door2,
-          sensor: p.attributes.sensor,
-          rain: p.attributes.rain,
-          ignition: p.attributes.ignition,
-          alarm: p.attributes.alarm,
-          input: p.attributes.input,
-          di2: p.attributes.di2,
-          di3: p.attributes.di3
-        }
-      }
-    })
+    const lighterPositions = data.route.filter(t => t.deviceId === d.id)
     if (lighterPositions.length > 0) {
       devicesResult.push({
         device: d,

package/src/util/utils.js

@@ -16,9 +16,10 @@ exports.getTranslations = (userData) => {
 }
 
 exports.getLanguage = (userData) => {
+  const partner = getUserPartner(userData.user)
   return userData.user.attributes.lang ||
     ((typeof navigator !== 'undefined') && navigator.language) ||
-    getUserPartner(userData.user).lang ||
+    (partner && partner.lang) ||
     'pt-BR'
 }