fleetmap-reports 1.0.488 → 1.0.490

package/package.json

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

package/src/speeding-report.js

@@ -68,6 +68,10 @@ async function createSpeedingReportByGroup (from, to, userData, traccarInstance)
   return reportData
 }
 
+function processServerSide () {
+  return (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server')
+}
+
 async function createSpeedingReportByDevice (from, to, userData, traccarInstance) {
   const devices = devicesToProcess(userData)
 
@@ -81,6 +85,10 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
   let deviceCount = 0
   for (const slice of sliced) {
     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}`)
+    }
     if (events.length > 0) {
       const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
       allData.devices.push(...devicesProcessed)
@@ -111,8 +119,8 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 }
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
-  if (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server') {
-    const url = `${process.env.REPORTS_SERVER}/reports/speeding-report/getEvents`
+  if (processServerSide()) {
+    const url = `https://${process.env.SERVER_HOST}/reports/speeding-report/getEvents`
     return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize }, { withCredentials: true }).then(d => d.data)
   } else {
     const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&
@@ -226,9 +234,7 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
     if (deviceEvents.length > 0) {
-      deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
       const positions = routes.filter(p => p.deviceId === d.id)
-
       for (const a of deviceEvents) {
         const pIndex = positions.findIndex(p => p.id === a.positionId)
         if (pIndex > 0) {
@@ -254,6 +260,7 @@ async function findEventsPosition (from, to, devices, events, routes, userData)
           return pIndex
         }
       }
+      deviceEvents.sort((a, b) => new Date(a.position.fixTime) - new Date(b.position.fixTime))
     }
   }
 }
@@ -271,6 +278,7 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
       if (position.speed > maxSpeed && !eventIsActive) {
         const event = {
           positionId: position && position.id,
+          position,
           deviceId: d.id,
           attributes: {
             speedLimit: maxSpeed,
@@ -291,52 +299,47 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
 async function getHereEvents (devices, routes, threshold) {
   try {
     console.log('env', process.env.PROCESS_HERE_EVENTS)
-    if (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server') {
-      const url = `${process.env.REPORTS_SERVER}/reports/here`
-      return axios.post(url, { devices, routes, threshold }).then(d => d.data)
-    } else {
-      console.log('here speed limit events')
-      const events = []
-      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)
-          resolve()
-        }
-        here.routeMatch(positions).then(results => {
-          const reduced = results.reduce((acc, cur, idx, src) => {
-            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)
-            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)
-              last.distance = distance.default(point([cur.position.longitude, cur.position.latitude]), point([last.position.longitude, last.position.latitude]))
-            } else if (cur.overSpeeding) {
-              cur.positionId = cur.position && cur.position.id
-              cur.roadSpeedLimit = cur.speedLimit
-              cur.deviceId = d.id
-              cur.attributes = { speedLimit: cur.speedLimit, speed: cur.currentSpeedKmh / 1.85200, maxSpeed: cur.position.speed }
-              cur.eventTime = 0
-              cur.distance = 0
-              acc.push(cur)
-            }
-            return acc
-          }, [])
-          if (!reduced.length) {
-            console.log('empty array after filter on device', d.name)
-            resolve()
+    console.log('here speed limit events')
+    const events = []
+    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)
+        resolve()
+      }
+      here.routeMatch(positions).then(results => {
+        const reduced = results.reduce((acc, cur, idx, src) => {
+          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)
+          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)
+            last.distance = distance.default(point([cur.position.longitude, cur.position.latitude]), point([last.position.longitude, last.position.latitude]))
+          } else if (cur.overSpeeding) {
+            cur.positionId = cur.position && cur.position.id
+            cur.roadSpeedLimit = cur.speedLimit
+            cur.deviceId = d.id
+            cur.attributes = { speedLimit: cur.speedLimit, speed: cur.currentSpeedKmh / 1.85200, maxSpeed: cur.position.speed }
+            cur.eventTime = 0
+            cur.distance = 0
+            acc.push(cur)
           }
-          events.push(...reduced)
+          return acc
+        }, [])
+        if (!reduced.length) {
+          console.log('empty array after filter on device', d.name)
           resolve()
-        }).catch(e => {
-          console.error('error on route match, moving on', e)
-          resolve()
-        })
-      }))
-      await Promise.all(promises)
-      return events
-    }
+        }
+        events.push(...reduced)
+        resolve()
+      }).catch(e => {
+        console.error('error on route match, moving on', e)
+        resolve()
+      })
+    }))
+    await Promise.all(promises)
+    return events
   } catch (e) {
     console.error(e)
   }