fleetmap-reports 1.0.474 → 1.0.476

package/package.json

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

package/src/index.test.js

@@ -8,8 +8,10 @@ async function getSpeedingReport (report, userData) {
     userData)
   assert.equal(data.length, 1)
   const device = data[0].devices[0]
+  console.log(device)
   const totalDistance = device.alerts.reduce((a, b) => a + b.distance, 0)
   const totalEventTime = device.alerts.reduce((a, b) => a + b.eventTime, 0)
+  console.log(device.alerts)
   return { device, totalDistance, totalEventTime }
 }
 
@@ -21,9 +23,10 @@ describe('Test_Reports', function () {
     const userData = await report.getUserData()
     userData.roadSpeedLimits = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 15) // Total Alerts
-    assert.equal(totalDistance, 19.59984677533689) // Total Kms
-    assert.equal(totalEventTime, 562000) // Total Duration
+    assert.equal(device.alerts.length, 11) // Total Alerts
+    console.log(device.alerts)
+    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

@@ -287,13 +287,15 @@ async function getHereEvents (devices, routes, threshold) {
           cur.position = positions.find(p => new Date(p.fixTime).getTime() === cur.timestamp)
           if (previous && previous.speedLimit === cur.speedLimit) {
             previous.eventTime += cur.timestamp - previous.timestamp
-            previous.attributes.maxSpeed = Math.max(previous.attributes.maxSpeed, cur.currentSpeedKmh)
+            previous.attributes.maxSpeed = Math.max(previous.attributes.maxSpeed, cur.position.speed)
             previous.distance += distance.default(point([cur.position.longitude, cur.position.latitude]), point([previous.position.longitude, previous.position.latitude]))
           } else {
             cur.positionId = cur.position && cur.position.id
             cur.roadSpeedLimit = cur.speedLimit
             cur.deviceId = d.id
-            cur.attributes = { speedLimit: cur.speedLimit, speed: cur.currentSpeedKmh / 1.85200 }
+            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 +320,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]),