fleetmap-reports 1.0.481 → 1.0.483

package/package.json

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

package/src/speeding-report.js

@@ -233,9 +233,17 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
           }
 
           if (!userData.roadSpeedLimits) {
+            console.log('ignorting eventdata')
             a.position = positions[pIndex]
             calculateEventData(positions, pIndex, a, d, geofence, userData)
           }
+          if (a.position.attributes.driverUniqueId) {
+            const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
+            a.driver = (driver && driver.name) || a.position.attributes.driverUniqueId
+          }
+          a.deviceName = d.name
+
+          return pIndex
         }
       }
     }
@@ -283,22 +291,21 @@ async function getHereEvents (devices, routes, threshold) {
     }
     here.routeMatch(positions).then(results => {
       const reduced = results.reduce((acc, cur, idx, src) => {
-        const previous = acc.length && acc.slice(-1)[0]
-        if (cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)) {
+        cur.overSpeeding = cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)
+        const last = acc.length && acc.slice(-1)[0]
+        if (cur.overSpeeding && last && src[idx - 1].overSpeeding && last.speedLimit === cur.speedLimit) {
           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.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, maxSpeed: cur.position.speed }
-            cur.eventTime = 0
-            cur.distance = 0
-            return acc.concat(cur)
-          }
+          last.eventTime = cur.timestamp - last.timestamp
+          last.attributes.maxSpeed = Math.max(last.attributes.maxSpeed, cur.position.speed)
+          last.distance = distance.default(point([cur.position.longitude, cur.position.latitude]), point([last.position.longitude, last.position.latitude]))
+        } else if (cur.overSpeeding) {
+          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, maxSpeed: cur.position.speed }
+          cur.eventTime = 0
+          cur.distance = 0
+          acc.push(cur)
         }
         return acc
       }, [])
@@ -337,15 +344,6 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
       }
     }
   }
-
-  if (alert.position.attributes.driverUniqueId) {
-    const driver = userData.drivers.find(d => d.uniqueId === alert.position.attributes.driverUniqueId)
-    alert.driver = driver && driver.name
-  }
-
-  alert.deviceName = device.name
-
-  return pIndex
 }
 
 async function exportSpeedingReportToPDF (userData, reportData) {