fleetmap-reports 1.0.484 → 1.0.486

package/package.json

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

package/src/index.test.js

@@ -23,7 +23,7 @@ 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, 11) // Total Alerts
+    assert.equal(device.alerts.length, 16) // Total Alerts
     console.log(device.alerts)
     assert.equal(totalDistance, 74.71054403083238) // Total Kms
     assert.equal(totalEventTime, 3009000) // Total Duration

package/src/speeding-report.js

@@ -13,6 +13,7 @@ const distance = require('@turf/distance')
 const { insideGeofence } = require('./util/geofence')
 const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
+const { default: axios } = require('axios')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -119,7 +120,9 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
 
   const events = []
   if (userData.roadSpeedLimits) {
-    events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
+    const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold)
+    console.log('got', hereResults.length, 'from here')
+    events.push(...hereResults)
   } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
     events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
   } else {
@@ -218,7 +221,7 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
     if (deviceEvents.length > 0) {
-      deviceEvents.sort((a, b) => a.positionId - b.positionId)
+      deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
       const positions = routes.filter(p => p.deviceId === d.id)
 
       for (const a of deviceEvents) {
@@ -281,47 +284,57 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 }
 
 async function getHereEvents (devices, routes, threshold) {
-  console.log('here speed limit events')
-  const events = []
-  const promises = devices.map(d => new Promise((resolve) => {
-    const positions = routes.filter(p => p.deviceId === d.id)
-    if (!positions.length) {
-      console.log('no positions on device', d.name)
-      resolve()
-    }
-    here.routeMatch(positions).then(results => {
-      const reduced = results.reduce((acc, cur, idx, src) => {
-        cur.overSpeeding = cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)
-        const last = acc.length && acc.slice(-1)[0]
-        cur.position = positions.find(p => new Date(p.fixTime).getTime() === cur.timestamp)
-        if (cur.overSpeeding && last && src[idx - 1].overSpeeding && last.speedLimit === cur.speedLimit) {
-          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)
+  try {
+    console.log('env', process.env.PROCESS_HERE_EVENTS)
+    if (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server') {
+      const url = `${process.env.REPORTS_SERVER}/reports/here`
+      return axios.post(url, { devices, routes, threshold }).then(d => d.data)
+    } else {
+      console.log('here speed limit events')
+      const events = []
+      const promises = devices.map(d => new Promise((resolve) => {
+        const positions = routes.filter(p => p.deviceId === d.id)
+        if (!positions.length) {
+          console.log('no positions on device', d.name)
+          resolve()
         }
-        return acc
-      }, [])
-      if (!reduced.length) {
-        console.log('empty array after filter on device', d.name)
-        resolve()
-      }
-      events.push(...reduced)
-      resolve()
-    }).catch(e => {
-      console.error(e)
-      resolve()
-    })
-  }))
-  await Promise.all(promises)
-  return events
+        here.routeMatch(positions).then(results => {
+          const reduced = results.reduce((acc, cur, idx, src) => {
+            cur.overSpeeding = cur.currentSpeedKmh > parseInt(cur.speedLimit) + (threshold || 0)
+            const last = acc.length && acc.slice(-1)[0]
+            cur.position = positions.find(p => new Date(p.fixTime).getTime() === cur.timestamp)
+            if (cur.overSpeeding && last && src[idx - 1].overSpeeding && last.speedLimit === cur.speedLimit) {
+              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
+          }, [])
+          if (!reduced.length) {
+            console.log('empty array after filter on device', d.name)
+            resolve()
+          }
+          events.push(...reduced)
+          resolve()
+        }).catch(e => {
+          console.error('error on route match, moving on', e)
+          resolve()
+        })
+      }))
+      await Promise.all(promises)
+      return events
+    }
+  } catch (e) {
+    console.error(e)
+  }
 }
 
 function calculateEventData (positions, pIndex, alert, device, geofence, userData) {