fleetmap-reports 1.0.867 → 1.0.868

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.867",
+  "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) {
@@ -323,7 +328,7 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
           // eslint-disable-next-line camelcase
           matched_points,
           edges
-        } = await axios.post(`${process.env.VALHALLA_BASEURL}/trace_attributes`,
+        } = await axios.post(`http://valhalla-${getCountry(slice[0]) || country}.pinme.io:8002/trace_attributes`,
           {
             costing: 'auto',
             shape_match: 'map_snap',
@@ -357,7 +362,7 @@ async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes
           }
         })
       } catch (e) {
-        console.error(e.message, e.response && e.response.data, slice)
+        console.error(e.message, e.response && e.response.data, slice[0])
       }
     }
     const reduced = results.reduce((acc, cur, idx, src) => {

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