fleetmap-reports 1.0.932 → 1.0.934

package/package.json

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

package/src/partnerReports/gpsjump-report.js

@@ -13,6 +13,11 @@ async function createGPSJumpReport (from, to, userData, traccar, minDistance) {
   for (const slice of sliced) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
+    allInOne.route.forEach(p => {
+      p.distance = p.attributes.distance
+      delete p.attributes
+    })
+
     slice.forEach(d => {
       const deviceData = getDeviceData(allInOne, d, userData.user, minDistance)
       reportData = reportData.concat(deviceData)
@@ -30,22 +35,22 @@ function getDeviceData (allInOne, d, user, minDistance) {
   return deviceRoute.map((pA, index) => {
     if (index < deviceRoute.length - 1) {
       const pB = deviceRoute[index + 1]
-      let distanceValue = pA.attributes.distance
-      if ((minDistance * 1000) >= pA.attributes.distance) {
-        distanceValue = distance.default([pA.longitude, pA.latitude], [pB.longitude, pB.latitude], { units: 'meters' })
-      }
-
-      return {
-        device: d.name,
-        dateA: convertToLocaleString(pA.fixTime, user.attributes.lang, user.attributes.timezone, user),
-        addressA: pA.address,
-        dateB: convertToLocaleString(pB.fixTime, user.attributes.lang, user.attributes.timezone, user),
-        addressB: pB.address,
-        distance: distanceValue
+      if ((minDistance * 1000) < pA.distance) {
+        const distanceValue = distance.default([pA.longitude, pA.latitude], [pB.longitude, pB.latitude], { units: 'meters' })
+        if ((minDistance * 1000) < distanceValue) {
+          return {
+            device: d.name,
+            dateA: convertToLocaleString(pA.fixTime, user.attributes.lang, user.attributes.timezone, user),
+            addressA: pA.address,
+            dateB: convertToLocaleString(pB.fixTime, user.attributes.lang, user.attributes.timezone, user),
+            addressB: pB.address,
+            distance: distanceValue
+          }
+        }
       }
     }
     return undefined
-  }).filter(a => a && (minDistance * 1000) < a.distance)
+  }).filter(a => a)
 }
 
 exports.createGPSJumpReport = createGPSJumpReport

package/src/tests/gpsjump.test.js

@@ -0,0 +1,23 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+const { convertMS } = require('../util/utils')
+const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
+
+// eslint-disable-next-line no-undef
+describe('gpsjump', function () {
+  // eslint-disable-next-line no-undef
+  it('gpsjump report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 22326)
+    const data = await createGPSJumpReport(
+      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    assert.equal(data[0].consumption, 19.799999999999997)
+    assert.equal(data[0].distance, 326.7657)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
+  }, 8000000)
+})