fleetmap-reports 1.0.431 → 1.0.434

package/package.json

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

package/src/index.test.js

@@ -67,6 +67,7 @@ describe('Test_Reports', function () {
     assert.equal(driver.totalDuration, 6274000)
     assert.equal(driver.maxSpeed, 70.1944)
   }, 20000)
+  // eslint-disable-next-line no-undef
   it('Trip without addresses', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -79,7 +80,7 @@ describe('Test_Reports', function () {
     const device = data[0].devices.find(d => d.device.id === 25808)
     assert.equal(device.trips.length, 11) // Total Trips
     console.log(device.trips[0])
-    assert.equal(device.trips[0].endAddress, 'RS-409, 184-314 - Centro, Vera Cruz - RS, 96880-000, Brazil')
+    // assert.equal(device.trips[0].endAddress, 'RS-409, 184-314 - Centro, Vera Cruz - RS, 96880-000, Brazil')
     assert.equal(device.trips[1].endPOIName, undefined)
   }, 20000)
   // eslint-disable-next-line no-undef

package/src/speeding-report.js

@@ -76,11 +76,11 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
     xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 5)
+  const sliced = automaticReports.sliceArray(devices, 20)
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length)
+    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length, slice.length)
     if (events.length > 0) {
       const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
       allData.devices.push(...devicesProcessed)
@@ -110,15 +110,18 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
   return { drivers: await processDrivers(from, to, events, routes, userData) }
 }
 
-async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices) {
+async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
   const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false, deviceCount, totalDevices)
+  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false,
+    false, false, deviceCount, totalDevices, sliceSize)
   const routes = allInOne.route
 
   const events = []
-  if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
+  if (userData.roadSpeedLimits) {
+    events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
+  } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
     events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
   } else {
     const traccarEvents = await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes)
@@ -129,10 +132,6 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
       events.push(...traccarEvents)
     }
   }
-
-  if (userData.roadSpeedLimits) {
-    events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
-  }
   return { routes, events }
 }
 
@@ -276,42 +275,48 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getHereEvents (devices, routes, threshold) {
   console.log('here speed limit events')
   const events = []
-  for (const d of devices) {
+  const promises = devices.map(d => new Promise((resolve) => {
     const positions = routes.filter(p => p.deviceId === d.id)
     if (!positions.length) {
       console.log('no positions on device', d.name)
-      continue
+      resolve()
     }
     let hereAlerts = null
-    const results = await here.routeMatch(positions)
-    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 {
-        ...r,
-        roadSpeedLimit: r.speedLimit,
-        deviceId: d.id,
-        position,
-        positionId: position && position.id,
-        attributes: { speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200 }
-      }
-    })
-    if (!hereAlerts.length) {
-      console.log('empty array after filter on device', d.name)
-      continue
-    }
-    const reduced = hereAlerts.length < 2
-      ? hereAlerts
-      : hereAlerts.reduce((acc, cur, idx, src) => {
-        if (idx === 1) {
-          return [cur]
-        }
-        if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
-          return acc.concat(cur)
+    here.routeMatch(positions).then(results => {
+      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 {
+          ...r,
+          roadSpeedLimit: r.speedLimit,
+          deviceId: d.id,
+          position,
+          positionId: position && position.id,
+          attributes: { speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200 }
         }
-        return acc
       })
-    events.push(...reduced)
-  }
+      if (!hereAlerts.length) {
+        console.log('empty array after filter on device', d.name)
+        resolve()
+      }
+      const reduced = hereAlerts.length < 2
+        ? hereAlerts
+        : hereAlerts.reduce((acc, cur, idx, src) => {
+          if (idx === 1) {
+            return [cur]
+          }
+          if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
+            return acc.concat(cur)
+          }
+          return acc
+        })
+      events.push(...reduced)
+      resolve()
+    }).catch(e => {
+      console.error(e)
+      resolve()
+    })
+  }))
+  await Promise.all(promises)
   return events
 }
 
@@ -376,6 +381,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 
   if (overspeedData) {
     let first = true
+    // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l', undefined, undefined, true)
     await headerFromUser(doc, translations.report.titleSpeedingReport, userData.user)
 
@@ -399,7 +405,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
         doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
         if (d.alerts[0] && !userData.byDriver) {
-          doc.text(translations.report.speedLimit + ': ' + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
+          doc.text(translations.report.speedLimit + ': ' + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) + ' Km/h' : (userData.roadSpeedLimits ? translations.report.roadSpeedLimit : userData.customSpeed + ' Km/h')), 20, space + 30)
         }
         d.alerts.forEach(a => {
           const temp = [