fleetmap-reports 1.0.423 → 1.0.426

package/package.json

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

package/src/index.test.js

@@ -64,7 +64,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, 'Rua Cláudio Manoel 184-314;Vera Cruz;Vera Cruz;96880-000;BR\n')
+    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

@@ -1,6 +1,6 @@
 const messages = require('../lang')
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString } = require('./util/utils')
+const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -12,6 +12,8 @@ const { devicesToProcess } = require('./util/device')
 const { point } = require('@turf/helpers')
 const distance = require('@turf/distance')
 const { insideGeofence } = require('./util/geofence')
+const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
+const automaticReports = require('./automaticReports')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -69,29 +71,24 @@ async function createSpeedingReportByGroup (from, to, userData, traccarInstance)
 async function createSpeedingReportByDevice (from, to, userData, traccarInstance) {
   const devices = devicesToProcess(userData)
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
-  const routes = allInOne.route
-  const events = []
-
-  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 {
-      events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
-    }
+  const allData = {
+    devices: [],
+    xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 
-  if (!events.length) {
-    // empty report
-    return { devices: [] }
-  }
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-  return {
-    devices: await processDevices(from, to, devices, events, routes, userData),
-    xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const { routes, events } = await getEvents(traccarInstance, from, to, slice, userData, deviceCount, devices.length)
+    if (events.length > 0) {
+      const devicesProcessed = await processDevices(from, to, slice, events, routes, userData)
+      allData.devices.push(...devicesProcessed)
+    }
+    deviceCount = deviceCount + slice.length
   }
+
+  return allData
 }
 
 async function createSpeedingReportByDriver (from, to, userData, traccarInstance) {
@@ -103,26 +100,73 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
     return { drivers: [] }
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
+  const { routes, events } = await getEvents(traccarInstance, from, to, devices, userData)
+
+  if (!events.length) {
+    // empty report
+    return { drivers: [] }
+  }
+
+  return { drivers: await processDrivers(from, to, events, routes, userData) }
+}
+
+async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices) {
+  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 routes = allInOne.route
 
   const events = []
   if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
     events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
   } else {
-    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
+    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)
+    }
   }
 
   if (userData.roadSpeedLimits) {
     events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
   }
+  return { routes, events }
+}
 
-  if (!events.length) {
-    // empty report
-    return { drivers: [] }
-  }
+function getGeofenceSpeedLimitEvents (geofencesFeatures, routes, devices) {
+  const events = []
 
-  return { drivers: await processDrivers(from, to, events, routes, userData) }
+  devices.forEach(d => {
+    const deviceRoute = routes.filter(p => p.deviceId === d.id)
+    const routePoints = deviceRoute.map(p => convertPositionToFeature(p))
+    geofencesFeatures.forEach(g => {
+      let eventIsActive = false
+      routePoints.forEach(p => {
+        if (booleanPointInPolygon.default(p, g) && p.properties.position.speed > g.properties.geofence.attributes.speedLimit) {
+          if (!eventIsActive) {
+            const event = {
+              positionId: p.properties.position.id,
+              deviceId: d.id,
+              geofenceId: g.properties.geofence.id,
+              attributes: {
+                speedLimit: g.properties.geofence.attributes.speedLimit,
+                speed: p.properties.position.speed
+              }
+            }
+            events.push(event)
+          }
+          eventIsActive = true
+        } else {
+          eventIsActive = false
+        }
+      })
+    })
+  })
+
+  return events
 }
 
 async function processDrivers (from, to, events, routes, userData) {

package/src/trip-report.js

@@ -158,7 +158,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
         trip.stopEngineHours = 0
       }
       if (trip.endAddress === null) {
-        traccar.axios.get(`/server/geocode?latitude=${trip.latitude}&longitude=${trip.longitude}`)
+        traccar.axios.get(`/server/geocode?latitude=${trip.endLat}&longitude=${trip.endLon}`)
           .then(d => { trip.endAddress = d.data })
       }
     })