fleetmap-reports 1.0.838 → 1.0.840

package/package.json

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

package/src/partnerReports/gpsjump-report.js

@@ -1,5 +1,6 @@
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
+const distance = require('@turf/distance')
 
 async function createGPSJumpReport (from, to, userData, traccar) {
   const reportData = []
@@ -9,12 +10,11 @@ async function createGPSJumpReport (from, to, userData, traccar) {
   const sliced = automaticReports.sliceArray(devices, 5)
   let deviceCount = 0
   for (const slice of sliced) {
-    slice.forEach(d => {
-      const deviceData = {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
-      }
-      deviceData.device = d.name
-      reportData.push(deviceData)
+    slice.forEach(d => {
+      const deviceData = getDeviceData(allInOne, d)
+      reportData.push(...deviceData)
     })
 
     deviceCount = deviceCount + slice.length
@@ -23,4 +23,25 @@ async function createGPSJumpReport (from, to, userData, traccar) {
   return reportData
 }
 
+function getDeviceData (allInOne, d) {
+  const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
+
+  return deviceRoute.map((pA, index) => {
+    if (index < deviceRoute.length - 1) {
+      const pB = deviceRoute[index + 1]
+      const distanceValue = distance.default([pA.longitude, pA.latitude], [pB.longitude, pB.latitude], 'meters')
+
+      return {
+        device: d.name,
+        dateA: pA.fixTime,
+        addressA: pA.address,
+        dateB: pB.fixTime,
+        addressB: pB.address,
+        distance: distanceValue
+      }
+    }
+    return undefined
+  })
+}
+
 exports.createGPSJumpReport = createGPSJumpReport

package/src/tests/index.test.js

@@ -2,6 +2,7 @@
 const { getReports } = require('./index')
 const assert = require('assert')
 const utils = require('../util/utils')
+const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
@@ -18,12 +19,18 @@ describe('Test_Reports', function () {
     const pdf = await report.speedingReportToPDF(userData, data[0])
     pdf.save()
   }, 40000)
-
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
-
+  it('gps jump device', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createGPSJumpReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+      new Date(2022, 0, 3, 23, 59, 59, 0),
+      userData, report.traccar)
+    console.log(data)
+  }, 40000)
   it('Idle by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -54,7 +61,7 @@ describe('Test_Reports', function () {
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
     assert.equal(driver.idleEvents.length, 15) // Total Alerts
     assert.equal(totalIdleTime, 16000) // Total Duration
-  }, 20000)
+  }, 20000),
   // eslint-disable-next-line no-undef
   it('test allinone', async () => {
     console.log('Start')