fleetmap-reports 1.0.866 → 1.0.868

package/package.json

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

package/src/speeding-report.js

@@ -299,18 +299,23 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
   return events
 }
 
+function getCountry (position) {
+  const country = crg.get_country(position.latitude, position.longitude)
+  return country && country.code
+}
+
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes[0]
-  const country = crg.get_country(position.latitude, position.longitude)
+  const country = getCountry(position)
   const config = {
     CHL: getOSMSpeedingEvents,
     MAR: getOSMSpeedingEvents
   }
-  const method = config[country && country.code] || getHereEvents
-  return method(devices, routes, threshold, minimumMinutes)
+  const method = config[country] || getHereEvents
+  return method(devices, routes, threshold, minimumMinutes, country && country.code)
 }
 
-async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0) {
+async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
   const chunk = 1000
   const events = []
   for (const d of devices) {
@@ -318,38 +323,47 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
     const results = []
     for (let i = 0; i < route.length; i += chunk) {
       const slice = route.slice(i, i + chunk)
-      // 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)
-
-      // 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 })
-        }
-      })
+      try {
+        const {
+          // eslint-disable-next-line camelcase
+          matched_points,
+          edges
+        } = await axios.post(`http://valhalla-${getCountry(slice[0]) || country}.pinme.io:8002/trace_attributes`,
+          {
+            costing: 'auto',
+            shape_match: '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)
+        // 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 })
+          }
+        })
+      } catch (e) {
+        console.error(e.message, e.response && e.response.data, slice[0])
+      }
     }
     const reduced = results.reduce((acc, cur, idx, src) => {
       const last = acc.length && acc.slice(-1)[0]

package/src/tests/speeding.test.js

@@ -20,7 +20,7 @@ describe('speeding tests', function () {
     const userData = await report.getUserData()
     userData.roadSpeedLimits = true
     const { device } = await getSpeedingReport(report, userData)
-    assert.equal(device.alerts.length, 9) // Total Alerts
+    assert.equal(device.alerts.length, 6) // Total Alerts
     console.log(device.alerts)
 
     userData.minimumIdleMinutes = 1