fleetmap-reports 1.0.475 → 1.0.477

package/package.json

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

package/src/index.test.js

@@ -24,9 +24,9 @@ describe('Test_Reports', function () {
     userData.roadSpeedLimits = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 11) // Total Alerts
-    console.log(device.alerts[0])
-    assert.equal(totalDistance, 74.71054403083238) // Total Kms
-    assert.equal(totalEventTime, 562000) // Total Duration
+    console.log(device.alerts)
+    assert.equal(totalDistance, 113.82700635835963) // Total Kms
+    assert.equal(totalEventTime, 5258000) // Total Duration
   }, 200000)
   // eslint-disable-next-line no-undef
   it('Speeding with custom speed', async () => {

package/src/speeding-report.js

@@ -222,7 +222,7 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
       const positions = routes.filter(p => p.deviceId === d.id)
 
       for (const a of deviceEvents) {
-        let pIndex = positions.findIndex(p => p.id === a.positionId)
+        const pIndex = positions.findIndex(p => p.id === a.positionId)
         if (pIndex > 0) {
           let geofence = null
           if (a.geofenceId) {
@@ -233,8 +233,11 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
           }
 
           a.position = positions[pIndex]
-          pIndex = calculateEventData(positions, pIndex, a, d, geofence, userData)
-          positions.slice(pIndex)
+          // TODO: we should user something else
+          // the linkId property exists when speed events come from here, in that case the data is already calculated 
+          if (!d.linkId) {
+            calculateEventData(positions, pIndex, a, d, geofence, userData)
+          }
         }
       }
     }
@@ -294,6 +297,8 @@ async function getHereEvents (devices, routes, threshold) {
             cur.roadSpeedLimit = cur.speedLimit
             cur.deviceId = d.id
             cur.attributes = { speedLimit: cur.speedLimit, speed: cur.currentSpeedKmh / 1.85200, maxSpeed: cur.position.speed }
+            cur.eventTime = 0
+            cur.distance = 0
             return acc.concat(cur)
           }
         }
@@ -318,7 +323,10 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
   let dist = 0
-  if (alert.eventTime) { return -1 }
+  if (alert.eventTime) {
+    console.log('ignoring')
+    return -1
+  }
   while (pIndex + 1 < positions.length) {
     pIndex++
     dist += distance.default(point([endEventPosition.longitude, endEventPosition.latitude]),