fleetmap-reports 1.0.700 → 1.0.702

package/package.json

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

package/src/idle-report.js

@@ -1,6 +1,10 @@
 const jsPDF = require('jspdf')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
-const { convertToLocaleString, convertMS, getTranslations, getLanguage, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
+const {
+  convertToLocaleString, convertMS, getTranslations, getLanguage, convertToLocaleDateString, convertToLocaleTimeString,
+  convertPositionToFeature,
+  convertToFeature
+} = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
@@ -8,7 +12,7 @@ const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverData } = require('./util/driver')
-const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
+const { getNearestPOIs, checkGeofenceIn, loadGroupsData } = require('./util/geofence')
 
 const fileName = 'IdleReport'
 
@@ -202,10 +206,9 @@ function findPOIData (event, userData) {
   }
 }
 
-function findGeofenceData (event, userData) {
-  const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
-    insideGeofence({ latitude: event.position.latitude, longitude: event.position.longitude }, g)
-  )
+function findGeofenceData (event, userData, geofences) {
+  const geofence = geofences.find(g =>
+    checkGeofenceIn(convertPositionToFeature(event.position), convertToFeature(g)))
   if (geofence) {
     const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
     event.geofenceName = geofence.name

package/src/tests/idle.test.js

@@ -0,0 +1,17 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+// eslint-disable-next-line no-undef
+describe('idle', function () {
+  // eslint-disable-next-line no-undef
+  it('works with afriquia', async () => {
+    const report = await getReports('moviflotte@gmail.com', 'moviflotte@gmail.com')
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.idleReport(
+      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+      userData)
+    console.log('result', result)
+  }, 4000000)
+})

package/src/tests/index.test.js

@@ -17,12 +17,10 @@ describe('Test_Reports', function () {
       userData)
     await report.speedingReportToPDF(userData, data)
   }, 40000)
-
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
-
   // eslint-disable-next-line no-undef
   it('Trip by device', async () => {
     const report = await getReports()

package/src/tests/zones.test.js

@@ -1,5 +1,9 @@
 const { getReports } = require('./index')
+const assert = require('assert')
+const ellca = require('./ellca.json')
+// eslint-disable-next-line no-undef
 describe('zones', function () {
+  // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -20,7 +24,6 @@ describe('zones', function () {
     const report = await getReports('moviflotte@gmail.com', 'moviflotte@gmail.com')
     const userData = await report.getUserData()
     console.log(userData.devices.length)
-    console.log(userData.devices.map(d => d.id))
     console.log(userData.geofences)
     const result = await report.zoneReport(
       new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
@@ -28,4 +31,20 @@ describe('zones', function () {
       userData)
     console.log('result', result)
   }, 4000000)
+
+  // eslint-disable-next-line no-undef
+  it('works with casais', async () => {
+    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
+    const result = await report.zoneReport(
+      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
+      userData)
+    const first = result[0].devices[0].geofences[0]
+    console.log(first)
+    assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
+    assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
+  }, 4000000)
 })

package/src/util/utils.js

@@ -245,4 +245,4 @@ exports.calculateDistance = (positions) => {
     }, 0) || 0
 }
 
-exports.sortPositions = (a, b) => new Date(a).getTime() - new Date(b).getTime()
+exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()

package/src/zone-report.js

@@ -325,7 +325,7 @@ function getInAndOutEvents (devices, route, userData) {
           if (!checkGeofenceIn(p, g)) {
             deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
           } else {
-            previous.inside[id] = true
+            p.inside[id] = true
           }
         } else {
           if (checkGeofenceIn(p, g)) {