fleetmap-reports 1.0.819 → 1.0.821

package/package.json

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

package/src/automaticReports.js

@@ -8,7 +8,6 @@ function sliceArray (longArray, size) {
   const arrayToSlice = longArray.slice()
 
   const arrayOfArrays = []
-  console.log('slice', arrayToSlice.length, 'in chunks of', size)
   for (let i = 0; i < arrayToSlice.length; i += size) {
     arrayOfArrays.push(arrayToSlice.slice(i, i + size))
   }

package/src/partnerReports/afriquia.js

@@ -7,10 +7,6 @@ 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

@@ -210,13 +210,14 @@ async function processDrivers (from, to, events, routes, userData) {
 
   return driversResult
 }
+const MAX_DEVICE_SPEED = 160
 
 function processDevices (from, to, devices, events, routes, userData) {
   const devicesResult = []
   findEventsPosition(from, to, devices, events, routes, userData)
 
   for (const d of devices) {
-    const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
+    const deviceEvents = events.filter(e => e.deviceId === d.id && e.position).filter(e => e.position.speed < MAX_DEVICE_SPEED)
     if (deviceEvents.length > 0) {
       deviceEvents.sort((a, b) => a.positionId - b.positionId)
       devicesResult.push({

package/src/tests/activity.test.js

@@ -7,14 +7,11 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 31, 23, 59, 59, 0),
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
+      new Date(2023, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary[0].startOdometer, 0)
-    assert.equal(device.summary[0].distance, 0)
     assert.equal(device.summary[0].startTime, 0)
     assert.equal(device.summary[0].endTime, 0)
   }, 80000)
@@ -72,4 +69,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/speeding.test.js

@@ -37,10 +37,12 @@ describe('speeding tests', function () {
     userData.customSpeed = false
     userData.useVehicleSpeedLimit = true
     const data = await report.speedingReport(
-      new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 9, 23, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 22, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 23, 23, 59, 59, 0)),
       userData)
-    assert.equal(data[0].devices.length, 0)
+    console.log(data[0].devices[0].alerts.length)
+    console.log(data[0].devices[0].alerts)
+    assert.equal(data[0].devices.length, 2)
   }, 900000)
 
   // eslint-disable-next-line no-undef

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide } = require('./utils')
+const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide, calculateDistance } = require('./utils')
 const { isInside } = require('./timetable')
 
 const minDistance = 0
@@ -120,7 +120,7 @@ function calculateTrip (device, route) {
   return {
     deviceId: device.id,
     deviceName: device.name,
-    distance: route.reduce((a, b) => a + b.attributes.distance, 0),
+    distance: calculateDistance(route) * 1000,
     averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
     maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
     spentFuel: 0,