fleetmap-reports 1.0.592 → 1.0.594

package/lang/frFR.js

@@ -161,7 +161,7 @@ module.exports = {
     select_geofences_placeholder: 'Geofences',
     select_period: 'Select period',
     period: 'Period',
-    titleTripReport: 'Reporte de viaje',
+    titleTripReport: 'Rapport de voyage',
     titleLocationReport: 'Rapport de localisation',
     titleSpeedingReport: 'Rapport de survitesse',
     titleZoneReport: 'Rapport de zones',

package/package.json

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

package/src/speeding-report.js

@@ -1,8 +1,5 @@
 const jsPDF = require('jspdf')
-const {
- convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage,
-  checkGeocoding
-} = require('./util/utils')
+const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -100,7 +97,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
       }
     }))
   }
-  checkGeocoding(allData)
+
   return allData
 }
 

package/src/tests/index.test.js

@@ -412,4 +412,17 @@ describe('Test_Reports', function () {
     assert.equal(device.geofences[0].totalTime, '28777')
     assert.equal(device.geofences[0].geofenceName, 'Casa João')
   }, 30000)
+  // eslint-disable-next-line no-undef
+  it('Zone Report With Stops', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.onlyWithStop = true
+    const data = await report.zoneReport(new Date(2023, 1, 1, 0, 0, 0, 0),
+      new Date(2023, 1, 5, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 82063)
+    assert.equal(device.geofences.length, 15)
+  }, 30000)
 })

package/src/util/route.js

@@ -36,4 +36,20 @@ function getIdleEvents (route, driver) {
 
   return idleEvents
 }
+
+function filterPositions (positions) {
+  return positions.filter(filterPosition)
+}
+
+function filterPosition (p) {
+  if (p.valid === false) {
+    return p.attributes.ignition || p.attributes.motion
+  }
+  if (p.protocol === 'osmand') {
+    return !(p.attributes.event >= 200 || p.attributes.event === 30)
+  }
+  return true
+}
+
 exports.getIdleEvents = getIdleEvents
+exports.filterPositions = filterPositions

package/src/util/utils.js

@@ -227,8 +227,3 @@ exports.getLogo = (user) => {
 }
 exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature
-
-function checkGeocoding () {
-}
-
-exports.checkGeocoding = checkGeocoding

package/src/zone-report.js

@@ -13,6 +13,7 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const distance = require('@turf/distance')
 const axios = require('axios')
 const { processServerSide } = require('./util')
+const { filterPositions } = require('./util/route')
 const sliceSize = 200
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -68,11 +69,13 @@ async function createZoneReport (from, to, userData, traccar) {
       traccar, from, to, slice, true, false, false, false,
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
-    const alerts = getInAndOutEvents(slice, data.route, userData)
+    const route = filterPositions(data.route)
+
+    const alerts = getInAndOutEvents(slice, route, userData)
     console.log('Geofence Enter/Exit Alerts:' + alerts.length)
 
     if (alerts.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route: data.route }))
+      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -87,6 +90,8 @@ async function processDevices (from, to, devices, userData, data) {
 
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
+    const deviceRoute = data.route.filter(p => p.deviceId === d.id)
+
     if (alerts.length > 0) {
       const zoneInOutData = []
       const zoneInData = {}
@@ -101,9 +106,8 @@ async function processDevices (from, to, devices, userData, data) {
             const geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (zoneInData[a.geofenceId]) {
               const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
-              const route = data.route.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
+              const route = deviceRoute.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
                   new Date(p.fixTime).getTime() <= new Date(a.position.fixTime).getTime())
-              console.log(route)
               if (geofence) {
                 zoneInOutData.push({
                   inTime: zoneInData[a.geofenceId].position,
@@ -167,6 +171,9 @@ function getInAndOutEvents (devices, route, userData) {
 
     const entryMap = []
     routePoints.forEach(p => {
+      if (!p.properties.position.valid) {
+        return
+      }
       geofencesFeatures.forEach(g => {
         if (g.geometry.type === 'Polygon') {
           if (booleanPointInPolygon.default(p, g)) {
@@ -343,7 +350,6 @@ function exportZoneReportToExcel (userData, reportData) {
         }
       }))
     })
-    console.log(data)
     return {
       headers,
       data,