fleetmap-reports 1.0.500 → 1.0.502

package/package.json

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

package/src/location-report.js

@@ -113,21 +113,32 @@ function processDevices (from, to, devices, data, userData) {
   for (const d of devices) {
     const positions = data.route.filter(t => t.deviceId === d.id)
 
-    if (userData.drivers.length > 0) {
-      positions.forEach(p => {
-        const driver = userData.drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
-        if (driver) {
-          p.driverName = driver.name
+    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
         }
-      })
-    }
-
-    if (positions.length > 0) {
+      }
+    })
+    if (lighterPositions.length > 0) {
       devicesResult.push({
         device: d,
         from,
         to,
-        positions
+        positions: lighterPositions
       })
     }
   }

package/src/util/traccar.js

@@ -91,6 +91,7 @@ async function getAllInOne (
     const requests = []
     for (const _chunk of automaticReports.sliceArray(chunk, devicesPerRequest)) {
       const u = url + '&' + _chunk.map(d => `deviceId=${d.id}`).join('&')
+      console.log(u)
       requests.push(
         traccar.axios.get(u, {
           jar: traccar.cookieJar,