fleetmap-reports 1.0.486 → 1.0.488

package/package.json

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

package/src/speeding-report.js

@@ -111,30 +111,35 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 }
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
-  const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') &&
+  if (process.env.PROCESS_HERE_EVENTS && process.env.PROCESS_HERE_EVENTS === 'server') {
+    const url = `${process.env.REPORTS_SERVER}/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') &&
       g.attributes.speedLimit).map(g => convertToFeature(g))
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false,
-    false, false, deviceCount, totalDevices, sliceSize)
-  const routes = allInOne.route
-
-  const events = []
-  if (userData.roadSpeedLimits) {
-    const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold)
-    console.log('got', hereResults.length, 'from here')
-    events.push(...hereResults)
-  } 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)
-    if (geofencesFeatures.length) {
-      events.push(...getGeofenceSpeedLimitEvents(geofencesFeatures, routes, devices))
-      events.push(...traccarEvents.filter(e => !(e.geofenceId)))
+    const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false,
+      false, false, deviceCount, totalDevices, sliceSize)
+    const routes = allInOne.route
+
+    const events = []
+    if (userData.roadSpeedLimits) {
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold)
+      console.log('got', hereResults.length, 'from here')
+      events.push(...hereResults)
+    } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
+      events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
     } else {
-      events.push(...traccarEvents)
+      const traccarEvents = await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes)
+      if (geofencesFeatures.length) {
+        events.push(...getGeofenceSpeedLimitEvents(geofencesFeatures, routes, devices))
+        events.push(...traccarEvents.filter(e => !(e.geofenceId)))
+      } else {
+        events.push(...traccarEvents)
+      }
     }
+    return { routes, events }
   }
-  return { routes, events }
 }
 
 function getGeofenceSpeedLimitEvents (geofencesFeatures, routes, devices) {
@@ -557,3 +562,4 @@ function getMaxSpeed (data) {
 exports.createSpeedingReport = createSpeedingReport
 exports.exportSpeedingReportToPDF = exportSpeedingReportToPDF
 exports.exportSpeedingReportToExcel = exportSpeedingReportToExcel
+exports.getEvents = getEvents