fleetmap-reports 1.0.958 → 1.0.959

package/package.json

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

package/src/tests/zones.test.js

@@ -61,4 +61,21 @@ describe('zones', function () {
     assert.equal(first.days[0].distanceOut, 0)
     assert.equal(first.days[2].distanceOut, 0)
   }, 4000000)
+
+  it('works with casais zones in columns 2', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.zonesByColumn = true
+    userData.devices = userData.devices.filter(d => d.id === 81201)
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+        g.name === 'baliza 2 - raio amarelo')
+    userData.onlyWithKmsOut = false
+    const result = await report.zoneReport(
+      new Date(Date.UTC(2023, 7, 7, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 7, 23, 59, 59, 0)),
+      userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[0].distanceOut, 554.6037095121401)
+  }, 4000000)
 })

package/src/zone-report.js

@@ -275,7 +275,7 @@ function getAnyLastExit (inDate, alerts, deviceRoute) {
     .filter(a => a.type === 'geofenceExit')
     .find(a => new Date(a.position.fixTime).getTime() < inDate)
 
-  if (next && !alerts.filter(a => a.type === 'geofenceExit' &&
+  if (next && !alerts.filter(a => a.type === 'geofenceEnter' &&
       new Date(a.position.fixTime).getTime() < inDate &&
       new Date(a.position.fixTime).getTime() > new Date(next.position.fixTime).getTime()).length) {
     return (next && next.position && new Date(next.position.fixTime).getTime()) ||
@@ -336,7 +336,7 @@ function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, f
 
 function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
   const zoneInOutData = []
-  const zoneInData = {}
+  let zoneInData = []
 
   alerts.forEach(a => {
     if (!a.position) {
@@ -345,11 +345,12 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
     if (a.type === 'geofenceEnter') {
       const driver = userData.drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
       a.position.driverName = driver ? driver.name : ''
-      if (Object.keys(zoneInData).length === 0) {
-        a.anyLastExit = getAnyLastExit(new Date(a.position.fixTime).getTime(), alerts, deviceRoute)
+      if (zoneInData.length === 0) {
+        const anyLastExist = getAnyLastExit(new Date(a.position.fixTime).getTime(), alerts, deviceRoute)
+        a.anyLastExit = anyLastExist || from
       }
 
-      zoneInData[a.geofenceId] = a
+      zoneInData.push(a)
     } else if (a.type === 'geofenceExit') {
       const geofence = userData.geofences.find(g => g.id === a.geofenceId)
       if (!geofence) {
@@ -364,22 +365,27 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
       const totalOutTime = nextIn - outDate
       const distanceOut = calculateDistance(routeAfterOut, device.attributes['report.ignoreOdometer'])
 
-      const anyNextIn = getAnyNextIn(outDate, alerts, deviceRoute)
-      const routeAfterOutAndBeforeAnyNextIn = deviceRoute.filter(p =>
-        new Date(p.fixTime).getTime() >= outDate &&
-          new Date(p.fixTime).getTime() <= anyNextIn
-      )
-      const distanceOutAny = Object.keys(zoneInData).length < 2 ? Math.round(calculateDistance(routeAfterOutAndBeforeAnyNextIn, device.attributes['report.ignoreOdometer'])) : 0
+      let anyNextIn
+      let distanceOutAny = 0
+      if (zoneInData.length < 2) {
+        anyNextIn = getAnyNextIn(outDate, alerts, deviceRoute)
+        const routeAfterOutAndBeforeAnyNextIn = deviceRoute.filter(p =>
+          new Date(p.fixTime).getTime() >= outDate &&
+            new Date(p.fixTime).getTime() <= anyNextIn
+        )
+        distanceOutAny = zoneInData.length < 2 ? Math.round(calculateDistance(routeAfterOutAndBeforeAnyNextIn, device.attributes['report.ignoreOdometer'])) : 0
+      }
 
-      if (zoneInData[a.geofenceId]) {
-        const totalInTime = new Date(a.position.fixTime).getTime() - new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
-        const inDate = new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
+      const inData = zoneInData.find(z => z.geofenceId === a.geofenceId)
+      if (inData) {
+        const totalInTime = new Date(a.position.fixTime).getTime() - new Date(inData.position.fixTime).getTime()
+        const inDate = new Date(inData.position.fixTime).getTime()
         const routeIn = deviceRoute.filter(p =>
           new Date(p.fixTime).getTime() >= inDate &&
           new Date(p.fixTime).getTime() < outDate
         )
         zoneInOutData.push({
-          inTime: zoneInData[a.geofenceId].position,
+          inTime: inData.position,
           outTime: a.position,
           totalInTime,
           totalOutTime,
@@ -391,9 +397,9 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
           geofenceName: geofence.name,
           geofenceId: geofence.id,
           stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
-          driverName: zoneInData[a.geofenceId].position.driverName
+          driverName: inData.position.driverName
         })
-        delete zoneInData[a.geofenceId]
+        zoneInData = zoneInData.filter(z => z.geofenceId === a.geofenceId)
       } else {
         const totalInTime = new Date(a.position.fixTime).getTime() - from.getTime()
         const routeIn = deviceRoute.filter(p =>
@@ -417,24 +423,23 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
     }
   })
 
-  for (const i in zoneInData) {
-    if (zoneInData[i]) {
-      const geofence = userData.geofences.find(g => g.id === zoneInData[i].geofenceId)
-      if (geofence) {
-        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() &&
+  for (const inData of zoneInData) {
+    const geofence = userData.geofences.find(g => g.id === inData.geofenceId)
+    if (geofence) {
+      const totalInTime = to.getTime() - new Date(inData.position.fixTime).getTime()
+      const routeIn = deviceRoute.filter(p =>
+        new Date(p.fixTime).getTime() >= new Date(inData.position.fixTime).getTime() &&
           new Date(p.fixTime).getTime() < to.getTime()
-        )
-        zoneInOutData.push({
-          inTime: zoneInData[i].position,
-          totalInTime,
-          distanceIn: calculateDistance(routeIn, device.attributes['report.ignoreOdometer']),
-          geofenceName: geofence.name,
-          geofenceId: geofence.id,
-          driverName: zoneInData[i].position.driverName
-        })
-      }
+      )
+      zoneInOutData.push({
+        inTime: inData.position,
+        totalInTime,
+        distanceIn: calculateDistance(routeIn, device.attributes['report.ignoreOdometer']),
+        geofenceName: geofence.name,
+        geofenceId: geofence.id,
+        driverName: inData.position.driverName,
+        anyLastExit: inData.anyLastExit
+      })
     }
   }