fleetmap-reports 1.0.651 → 1.0.653

package/package.json

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

package/src/util/device.js

@@ -2,7 +2,6 @@ function devicesToProcess (userData) {
   const groupIds = userData.groups.map(g => g.id)
   const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
   devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-
   console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
   return devices
 }

package/src/zone-report.js

@@ -27,7 +27,6 @@ async function createZoneReport (from, to, userData, traccar) {
     const url = `https://${process.env.SERVER_HOST}/reports/zone-report`
     return axios.post(url, { from, to, userData }, { withCredentials: true }).then(d => d.data)
   }
-  console.log('Create ZoneReport')
   const reportData = []
   const types = ['geofenceEnter', 'geofenceExit']
 
@@ -84,9 +83,10 @@ async function createZoneReport (from, to, userData, traccar) {
 }
 
 function getNextIn (outDate, alerts, geofenceId, deviceRoute) {
-  return alerts
+  const next = alerts
     .filter(a => a.type === 'geofenceEnter' && a.geofenceId === geofenceId)
-    .find(a => new Date(a.position.fixTime).getTime() > outDate) ||
+    .find(a => new Date(a.position.fixTime).getTime() > outDate)
+  return (next && next.position && new Date(next.position.fixTime).getTime()) ||
     new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
 }
 
@@ -102,47 +102,45 @@ async function processDevices (from, to, devices, userData, data) {
       const zoneInData = {}
 
       alerts.forEach(a => {
-        if (a.position) {
-          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 : ''
-            zoneInData[a.geofenceId] = a
-          } else if (a.type === 'geofenceExit') {
-            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 inDate = new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
-              const outDate = new Date(a.position.fixTime).getTime()
-              const routeIn = deviceRoute.filter(p =>
-                new Date(p.fixTime).getTime() >= inDate &&
+        if (!a.position) { return }
+        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 : ''
+          zoneInData[a.geofenceId] = a
+        } else if (a.type === 'geofenceExit') {
+          const geofence = userData.geofences.find(g => g.id === a.geofenceId)
+          if (!geofence) { return }
+          const outDate = new Date(a.position.fixTime).getTime()
+          const routeAfterOut = deviceRoute.filter(p =>
+            new Date(p.fixTime).getTime() >= outDate &&
+            new Date(p.fixTime).getTime() < getNextIn(outDate, alerts, a.geofenceId, deviceRoute)
+          )
+          const distanceOut = calculateDistance(routeAfterOut)
+          if (zoneInData[a.geofenceId]) {
+            const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
+            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
-              )
-              const routeAfterOut = deviceRoute.filter(p =>
-                new Date(p.fixTime).getTime() >= outDate &&
-                new Date(p.fixTime).getTime() < getNextIn(outDate, alerts, a.geofenceId, deviceRoute)
-              )
-              if (geofence) {
-                zoneInOutData.push({
-                  inTime: zoneInData[a.geofenceId].position,
-                  outTime: a.position,
-                  totalTime: totalInTime,
-                  distanceIn: calculateDistance(routeIn),
-                  distanceOut: calculateDistance(routeAfterOut),
-                  geofenceName: geofence.name,
-                  stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
-                  driverName: zoneInData[a.geofenceId].position.driverName
-                })
-              }
-              zoneInData[a.geofenceId] = null
-            } else {
-              if (geofence) {
-                zoneInOutData.push({
-                  outTime: a.position,
-                  geofenceName: geofence.name,
-                  driverName: ''
-                })
-              }
-            }
+            )
+            zoneInOutData.push({
+              inTime: zoneInData[a.geofenceId].position,
+              outTime: a.position,
+              totalTime: totalInTime,
+              distanceIn: calculateDistance(routeIn),
+              distanceOut,
+              geofenceName: geofence.name,
+              stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
+              driverName: zoneInData[a.geofenceId].position.driverName
+            })
+            zoneInData[a.geofenceId] = null
+          } else {
+            zoneInOutData.push({
+              outTime: a.position,
+              geofenceName: geofence.name,
+              driverName: '',
+              distanceOut
+            })
           }
         }
       })