fleetmap-reports 1.0.867 → 1.0.869

package/package.json

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

package/src/events-report.js

@@ -84,6 +84,13 @@ async function processDevices (from, to, devices, data, traccar, userData) {
       for (const a of deviceAlerts) {
         a.position = positions.find(p => p.id === a.positionId)
 
+        if (a.type === 'alarm' && a.position) {
+          for (const p of positions.filter(p => p.fixTime >= a.position.fixTime)) {
+            if (p.attributes.alarm !== a.position.attributes.alarm) { break }
+            a.endPosition = p
+          }
+        }
+
         if (!a.geofenceId && a.position) {
           const poi = getNearestPOI(a.position, userData.geofences)
           a.geofenceId = poi && poi.p.id

package/src/index.js

@@ -182,6 +182,5 @@ function Reports (config, axios, cookieJar) {
   this.stopReportToExcel = (userData, reportData) => {
     return require('./stop-report').exportStopReportToExcel(userData, reportData)
   }
-  this.getPdf = require('./carbone').getPdf
 }
 module.exports = Reports

package/src/partnerReports/afriquia.js

@@ -6,11 +6,6 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
-
-function calculateFirstStopTime (stopTime, from, time) {
-  return stopTime + (new Date(time).getTime() - from.getTime())
-}
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/speeding-report.js

@@ -299,18 +299,23 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
   return events
 }
 
+function getCountry (position) {
+  const country = crg.get_country(position.latitude, position.longitude)
+  return country && country.code
+}
+
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes[0]
-  const country = crg.get_country(position.latitude, position.longitude)
+  const country = getCountry(position)
   const config = {
     CHL: getOSMSpeedingEvents,
     MAR: getOSMSpeedingEvents
   }
-  const method = config[country && country.code] || getHereEvents
-  return method(devices, routes, threshold, minimumMinutes)
+  const method = config[country] || getHereEvents
+  return method(devices, routes, threshold, minimumMinutes, country && country.code)
 }
 
-async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0) {
+async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
   const chunk = 1000
   const events = []
   for (const d of devices) {
@@ -323,7 +328,7 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
           // eslint-disable-next-line camelcase
           matched_points,
           edges
-        } = await axios.post(`${process.env.VALHALLA_BASEURL}/trace_attributes`,
+        } = await axios.post(`http://valhalla-${getCountry(slice[0]) || country}.pinme.io:8002/trace_attributes`,
           {
             costing: 'auto',
             shape_match: 'map_snap',
@@ -357,7 +362,7 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
           }
         })
       } catch (e) {
-        console.error(e.message, e.response && e.response.data, slice)
+        console.error(e.message, e.response && e.response.data, slice[0])
       }
     }
     const reduced = results.reduce((acc, cur, idx, src) => {

package/src/tests/activity.test.js

@@ -72,4 +72,14 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
+  it('Activity test performance', async () => {
+    const report = await getReports('q.trans', 'quality1214')
+    const userData = await report.getUserData()
+    console.log(userData)
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
+        new Date(2023, 31, 5, 23, 59, 59, 0),
+        userData)
+    assert.equal(data.length, 1)
+  }, 8000000)
 })

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,19 @@ 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('HASSANE', 'movitec.1637')
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 148725)
+    const data = await createGPSJumpReport(new Date(2023, 8, 22, 0, 0, 0, 0),
+      new Date(2023, 8, 24, 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 +62,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')

package/src/tests/speeding.test.js

@@ -20,7 +20,7 @@ describe('speeding tests', function () {
     const userData = await report.getUserData()
     userData.roadSpeedLimits = true
     const { device } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 9) // Total Alerts
+    assert.equal(device.alerts.length, 6) // Total Alerts
     console.log(device.alerts)
 
     userData.minimumIdleMinutes = 1

package/src/tests/zones.test.js

@@ -27,6 +27,18 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('works with afriquia', async () => {
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)