fleetmap-reports 1.0.825 → 1.0.826

package/package.json

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

package/src/events-report.js

@@ -61,9 +61,10 @@ async function getReportData (from, to, devices, types, traccar) {
   const traccarTypes = new Set(types.map(t => t.startsWith('alarm') ? 'alarm' : t))
   await Promise.all(arrayOfArrays.map(async a => {
     const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, traccarTypes)
-    if (types.length > 0) {
-      data = data.concat(response.data)
-    }
+    data = data.concat(
+      response.data.filter(
+        e => types.find(t => t === e.type) || types.find(t => t.replace('alarm_', '') === e.attributes.alarm)
+      ))
   }))
   console.log('Alerts:' + data.length)
   return data
@@ -83,7 +84,7 @@ async function processDevices (from, to, devices, data, traccar, userData) {
       for (const a of deviceAlerts) {
         a.position = positions.find(p => p.id === a.positionId)
 
-        if (!a.geofenceId) {
+        if (!a.geofenceId && a.position) {
           const poi = getNearestPOI(a.position, userData.geofences)
           a.geofenceId = poi && poi.p.id
         }

package/src/tests/events.test.js

@@ -13,6 +13,7 @@ describe('events', function () {
     console.log('result', result)
   }, 4000000)
 
+  // eslint-disable-next-line no-undef
   it('works with pois', async () => {
     const report = await getReports(process.env.USER_NOGARTEL, process.env.PASS_NOGARTEL)
     const userData = await report.getUserData()