fleetmap-reports 1.0.959 → 1.0.960

package/package.json

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

package/src/tests/zones.test.js

@@ -78,4 +78,22 @@ describe('zones', function () {
     console.log(first)
     assert.equal(first.days[0].distanceOut, 554.6037095121401)
   }, 4000000)
+
+  it('works with casais zones in columns 3', 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, 8, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 8, 10, 23, 59, 59, 0)),
+        userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[0].distanceOut, 294.0468270741282)
+    assert.equal(first.days[1].distanceOut, 35.21209134706803)
+  }, 4000000)
 })

package/src/zone-report.js

@@ -368,12 +368,12 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
       let anyNextIn
       let distanceOutAny = 0
       if (zoneInData.length < 2) {
-        anyNextIn = getAnyNextIn(outDate, alerts, deviceRoute)
+        anyNextIn = getAnyNextIn(outDate, alerts, deviceRoute) || to
         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
+        distanceOutAny = Math.round(calculateDistance(routeAfterOutAndBeforeAnyNextIn, device.attributes['report.ignoreOdometer']))
       }
 
       const inData = zoneInData.find(z => z.geofenceId === a.geofenceId)
@@ -399,7 +399,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {
           stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
           driverName: inData.position.driverName
         })
-        zoneInData = zoneInData.filter(z => z.geofenceId === 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 =>