fleetmap-reports 1.0.277 → 1.0.282

package/package.json

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

package/src/here.js

@@ -97,10 +97,10 @@ function fillGeocoding(rows) {
 }*/
 
 exports.routeMatch = async (rows) => {
+  console.log('here sending', rows.length)
   const csv = generateCSV(rows)
   const response = await axios.post(calcRoute, csv, { headers: { 'Content-Type': 'application/binary' }})
   const hereData = response.data
-  console.dir(hereData, {depth: null})
   const route = hereData.response.route[0]
   const results = []
   const wayPoints = route.waypoint

package/src/speeding-report.js

@@ -237,10 +237,17 @@ async function getCustomSpeedLimitEvents(devices, routes){
 async function getHereEvents(devices, routes, threshold){
   console.log('here speed limit events')
   const events = []
+  let i,j, temporary, chunk = 10;
+  for (i = 0,j = devices.length; i < j; i += chunk) {
+    temporary = devices.slice(i, i + chunk);
+    await Promise.all(temporary.map(d =>
+        here.routeMatch(routes.filter(p => p.deviceId === d.id)).then(r => d.results = r)
+    ))
+  }
+
   for (const d of devices) {
-    const positions = routes.filter(p => p.deviceId === d.id)
     try {
-      const results = await here.routeMatch(positions)
+      const results = d.results
       const hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
         const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
         return {
@@ -263,7 +270,7 @@ async function getHereEvents(devices, routes, threshold){
       })
       events.push(...reduced)
     } catch (e) {
-      //console.error(e)
+      console.error(e)
     }
   }
   return events