fleetmap-reports 1.0.494 → 1.0.496

package/package.json

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

package/src/here.js

@@ -96,7 +96,6 @@ 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

package/src/speeding-report.js

@@ -106,7 +106,7 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
   const sliced = automaticReports.sliceArray(devices, 10)
   let deviceCount = 0
   for (const slice of sliced) {
-    const { routes, events } = await getEvents(traccarInstance, from, to, devices, userData, deviceCount, devices.length, slice.length)
+    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
     if (processServerSide()) {
       console.log('LOADING_MESSAGE:' + slice[0].name)
       console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
@@ -298,7 +298,7 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 
 async function getHereEvents (devices, routes, threshold) {
   try {
-    console.log('env', process.env.PROCESS_HERE_EVENTS)
+    console.log('PROCESS_HERE_EVENTS', process.env.PROCESS_HERE_EVENTS)
     console.log('here speed limit events', devices.length, 'devices')
     const events = []
     const promises = devices.map(d => new Promise((resolve) => {
@@ -307,12 +307,18 @@ async function getHereEvents (devices, routes, threshold) {
         console.log('no positions on device', d.name)
         resolve()
       }
+      console.log(d.name, 'sending', positions.length, 'to here')
       here.routeMatch(positions).then(results => {
         console.log(d.name, 'got', results.length, 'from here')
+        const timestamps = []
+        for (const p of positions) {
+          timestamps[new Date(p.fixTime).getTime()] = p
+        }
         const reduced = results.reduce((acc, cur, idx, src) => {
+          console.log('idx', idx)
           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)
+          cur.position = timestamps[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)
@@ -331,6 +337,8 @@ async function getHereEvents (devices, routes, threshold) {
         if (!reduced.length) {
           console.log('empty array after filter on device', d.name)
           resolve()
+        } else {
+          console.log(d.name, 'reduced to', reduced.length)
         }
         events.push(...reduced)
         resolve()