fleetmap-reports 1.0.693 → 1.0.694

package/package.json

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

package/src/tests/fuel.test.js

@@ -5,7 +5,6 @@ const assert = require('assert')
 const deviceId = 122575
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(5000000)
   it('Trip by device', async () => {
     console.log('trip by device')
     const report = await getReports()

package/src/tests/index.js

@@ -14,9 +14,9 @@ const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: t
 
 axiosCookieJarSupport(axios)
 
-const getReports = async () => {
+const getReports = async (email, password) => {
   try {
-    await new SessionApi(traccarConfig, null, axios).sessionPost(process.env.email, process.env.password)
+    await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
     return new Index(traccarConfig, axios, cookieJar)
   } catch (e) {
     console.error(e)

package/src/tests/zones.test.js

@@ -6,6 +6,7 @@ describe('zones', function () {
     const ellca = require('./ellca.json')
     userData.devices = userData.devices.filter(d => ellca.find(e => e === d.name))
     console.log(userData.devices.length)
+    console.log(userData.devices.map(d => d.id))
     userData.geofences = userData.geofences.filter(g => g.name === 'Geofence Ellca 2')
     console.log(userData.geofences)
     const result = await report.zoneReport(
@@ -14,4 +15,17 @@ describe('zones', function () {
       userData)
     console.log('result', result)
   }, 4000000)
+
+  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.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)),
+      new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+      userData)
+    console.log('result', result)
+  }, 4000000)
 })

package/src/zone-report.js

@@ -219,7 +219,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
       const nextIn = getNextIn(outDate, alerts, a.geofenceId, deviceRoute)
       const routeAfterOut = deviceRoute.filter(p =>
         new Date(p.fixTime).getTime() >= outDate &&
-          new Date(p.fixTime).getTime() < nextIn
+        new Date(p.fixTime).getTime() < nextIn
       )
       const totalOutTime = nextIn - outDate
       const distanceOut = calculateDistance(routeAfterOut)
@@ -228,7 +228,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         const inDate = new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
         const routeIn = deviceRoute.filter(p =>
           new Date(p.fixTime).getTime() >= inDate &&
-            new Date(p.fixTime).getTime() < outDate
+          new Date(p.fixTime).getTime() < outDate
         )
         zoneInOutData.push({
           inTime: zoneInData[a.geofenceId].position,
@@ -247,7 +247,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         const totalInTime = new Date(a.position.fixTime).getTime() - from.getTime()
         const routeIn = deviceRoute.filter(p =>
           new Date(p.fixTime).getTime() >= from.getTime() &&
-            new Date(p.fixTime).getTime() < outDate
+          new Date(p.fixTime).getTime() < outDate
         )
         zoneInOutData.push({
           outTime: a.position,
@@ -270,7 +270,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         const totalInTime = to.getTime() - new Date(zoneInData[i].position.fixTime).getTime()
         const routeIn = deviceRoute.filter(p =>
           new Date(p.fixTime).getTime() >= new Date(zoneInData[i].position.fixTime).getTime() &&
-            new Date(p.fixTime).getTime() < to.getTime()
+          new Date(p.fixTime).getTime() < to.getTime()
         )
         zoneInOutData.push({
           inTime: zoneInData[i].position,
@@ -296,14 +296,6 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
   return zoneInOutData
 }
 
-function checkGeofenceEnter (p1, p2, g) {
-  return !checkGeofenceIn(p1, g) && checkGeofenceIn(p2, g)
-}
-
-function checkGeofenceExit (p1, p2, g) {
-  return checkGeofenceEnter(p2, p1, g)
-}
-
 function getInAndOutEvents (devices, route, userData) {
   const events = []
   const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
@@ -313,22 +305,31 @@ function getInAndOutEvents (devices, route, userData) {
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
     const deviceEvents = []
     routePoints.filter(p => p.properties.position.valid).forEach((p, i, array) => {
+      p.inside = {}
       if (!i) {
-        for (const g of geofencesFeatures) {
+        geofencesFeatures.forEach((g, id) => {
           if (checkGeofenceIn(p, g)) {
+            p.inside[id] = true
             deviceEvents.push(createEvent('geofenceIn', d.id, p, g))
           }
-        }
+        })
         return
       }
       const previous = array[i - 1]
-      for (const g of geofencesFeatures) {
-        if (checkGeofenceEnter(previous, p, g)) {
-          deviceEvents.push(createEvent('geofenceEnter', d.id, p, g))
-        } else if (checkGeofenceExit(previous, p, g)) {
-          deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
+      geofencesFeatures.forEach((g, id) => {
+        if (previous.inside[id]) {
+          if (!checkGeofenceIn(p, g)) {
+            deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
+          } else {
+            previous.inside[id] = true
+          }
+        } else {
+          if (checkGeofenceIn(p, g)) {
+            p.inside[id] = true
+            deviceEvents.push(createEvent('geofenceEnter', d.id, p, g))
+          }
         }
-      }
+      })
     })
     events.push(...deviceEvents)
   })