fleetmap-reports 1.0.862 → 1.0.864

package/package.json

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

package/src/speeding-report.js

@@ -316,42 +316,46 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
     const route = routes.filter(r => r.deviceId === d.id)
     const results = []
     for (let i = 0; i < route.length; i += chunk) {
-      const apiKey = process.env.geoapifyKey
       const slice = route.slice(i, i + chunk)
-      const { features } = await axios.post(`https://api.geoapify.com/v1/mapmatching?apiKey=${apiKey}`, {
-        mode: 'drive',
-        waypoints: slice.map(p => ({
-          timestamp: new Date(p.fixTime).toISOString(),
-          bearing: p.course,
-          location: [p.longitude, p.latitude]
+      // eslint-disable-next-line camelcase
+      const { matched_points, edges } = await axios.post('https://valhalla1.openstreetmap.de/trace_attributes', {
+        costing: 'auto',
+        'shape_match type': 'map_snap',
+        filters: {
+          attributes: [
+            'admin.country_code',
+            'admin.country_text',
+            'admin.state_code',
+            'admin.state_text',
+            'edge.names',
+            'edge.way_id',
+            'edge.speed_limit',
+            'matched.point',
+            'matched.type',
+            'matched.edge_index'
+          ],
+          action: 'include'
+        },
+        shape: slice.map(p => ({
+          lon: p.longitude, lat: p.latitude
         }))
       }).then(r => r.data)
 
-      const { properties } = features[0]
-      for (const wp of properties.waypoints) {
-        const leg = properties.legs[wp.leg_index]
-        if (!leg) {
-          console.log('ignoring legs (count):', properties.legs.count, wp.leg_index)
-          continue
+      // eslint-disable-next-line camelcase
+      matched_points.forEach((mp, mIndex) => {
+        const edge = edges[mp.edge_index]
+        const position = route[mIndex + i]
+        if (edge && (edge.speed_limit + (threshold || 0)) < position.speed * 1.852) {
+          results.push({ ...mp, ...edge, ...position })
         }
-        const step = leg.steps[wp.step_index]
-        const position = route[wp.original_index + i]
-        if (!step) {
-          console.log('ignoring', wp.step_index, wp.leg_index, properties.legs[0].steps[wp.step_index], properties.legs[0].steps.length)
-          continue
-        }
-        if (wp.match_type !== 'unmatched' && step.speed_limit < position.speed * 1.852) {
-          results.push({ ...wp, ...step, ...position })
-        }
-      }
+      })
     }
     const reduced = results.reduce((acc, cur, idx, src) => {
-      cur.overSpeeding = cur.speed * 1.852 > cur.speed_limit + (threshold || 0)
       const last = acc.length && acc.slice(-1)[0]
-      if (cur.overSpeeding && last && src[idx - 1].overSpeeding && last.speed_limit === cur.speed_limit) {
+      if (last && new Date(cur.fixTime) - new Date(src[idx - 1]) < 1000 * 60 * 2) {
         last.eventTime = new Date(cur.fixTime) - new Date(last.fixTime)
         last.attributes.maxSpeed = Math.max(last.attributes.maxSpeed, cur.speed)
-        last.distance = distance.default(point([cur.longitude, cur.latitude]), point([last.longitude, last.latitude]))
+        last.distance += distance.default(point([cur.longitude, cur.latitude]), point([src[idx - 1].longitude, src[idx - 1].latitude]))
       } else if (cur.overSpeeding) {
         cur.positionId = cur && cur.id
         cur.roadSpeedLimit = cur.speed_limit
@@ -415,7 +419,7 @@ async function getHereEvents (devices, routes, threshold, minimumMinutes = 0) {
         events.push(...reduced)
         resolve()
       }).catch(e => {
-        console.warn('route match, moving on', e.message)
+        console.warn('route match, moving on', e.message, e.response && e.response.data)
         resolve()
       })
     }))

package/src/tests/speeding.test.js

@@ -26,7 +26,7 @@ describe('speeding tests', function () {
     userData.minimumIdleMinutes = 1
     const r = await getSpeedingReport(report, userData)
     r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
-    assert.equal(r.device.alerts.length, 6) // Total Alerts
+    assert.equal(r.device.alerts.length, 2) // Total Alerts
   }, 200000)
 
   // eslint-disable-next-line no-undef