fleetmap-reports 1.0.477 → 1.0.480

package/package.json

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

package/src/index.test.js

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

package/src/speeding-report.js

@@ -232,10 +232,8 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
             }
           }
 
-          a.position = positions[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) {
+          if (!userData.roadSpeedLimits) {
+            a.position = positions[pIndex]
             calculateEventData(positions, pIndex, a, d, geofence, userData)
           }
         }
@@ -323,10 +321,6 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
   let dist = 0
-  if (alert.eventTime) {
-    console.log('ignoring')
-    return -1
-  }
   while (pIndex + 1 < positions.length) {
     pIndex++
     dist += distance.default(point([endEventPosition.longitude, endEventPosition.latitude]),