fleetmap-reports 1.0.674 → 1.0.676

package/package.json

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

package/src/zone-report.js

@@ -71,9 +71,8 @@ async function createZoneReport (from, to, userData, traccar) {
     const route = filterPositions(data.route)
     const alerts = getInAndOutEvents(slice, route, userData)
 
-    if (alerts.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
-    }
+    allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
+
     deviceCount = deviceCount + slice.length
   }
 
@@ -97,11 +96,11 @@ async function processDevices (from, to, devices, userData, data) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
 
-    if (alerts.length > 0) {
-      const zoneInOutData = userData.groupByDay
-        ? analyseAlertsGroupGeofences(alerts, deviceRoute, from, to)
-        : analyseAlerts(alerts, deviceRoute, userData)
+    const zoneInOutData = userData.groupByDay
+      ? analyseAlertsGroupGeofences(alerts, deviceRoute, from, to)
+      : analyseAlerts(alerts, deviceRoute, userData)
 
+    if (zoneInOutData.length > 0) {
       const result = userData.onlyWithStop ? zoneInOutData.filter(d => d.stopped) : zoneInOutData
 
       if (userData.groupByDay) {
@@ -272,6 +271,15 @@ function analyseAlertsGroupGeofences (alerts, deviceRoute, from, to) {
     })
   }
 
+  if (!zoneInOutData.length) {
+    const geofenceIn = alerts.find(a => a.type === 'geofenceIn')
+    zoneInOutData.push({
+      distanceIn: geofenceIn ? calculateDistance(deviceRoute) : 0,
+      distanceOut: !geofenceIn ? calculateDistance(deviceRoute) : 0,
+      totalTime: to.getTime() - from.getTime()
+    })
+  }
+
   return zoneInOutData
 }
 
@@ -344,40 +352,50 @@ function analyseAlerts (alerts, deviceRoute, userData) {
 }
 
 function checkGeofenceEnter (p1, p2, g) {
+  return !checkGeofenceIn(p1, g) && checkGeofenceIn(p2, g)
+}
+
+function checkGeofenceExit (p1, p2, g) {
+  return checkGeofenceEnter(p2, p1, g)
+}
+
+function checkGeofenceIn (p, g) {
   switch (g.geometry.type) {
     case 'Polygon':
-      return !booleanPointInPolygon.default(p1, g) && booleanPointInPolygon.default(p2, g)
+      return booleanPointInPolygon.default(p, g)
     case 'Point':
-      return distance.default(p1, g, { units: 'meters' }) >= g.properties.distance &&
-        distance.default(p2, g, { units: 'meters' }) < g.properties.distance
+      return distance.default(p, g, { units: 'meters' }) >= g.properties.distance
     case 'LineString':
-      return pointToLineDistance.default(p1, g, { units: 'meters' }) > (g.properties.geofence.attributes.polylineDistance || 25) &&
-        pointToLineDistance.default(p2, g, { units: 'meters' }) <= (g.properties.geofence.attributes.polylineDistance || 25)
+      return pointToLineDistance.default(p, g, { units: 'meters' }) > (g.properties.geofence.attributes.polylineDistance || 25)
   }
 }
 
-function checkGeofenceExit (p1, p2, g) {
-  return checkGeofenceEnter(p2, p1, g)
-}
-
 function getInAndOutEvents (devices, route, userData) {
   const events = []
   devices.forEach(d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
     const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
-
+    const deviceEvents = []
     routePoints.filter(p => p.properties.position.valid).forEach((p, i, array) => {
-      if (!i) { return }
+      if (!i) {
+        for (const g of geofencesFeatures) {
+          if (checkGeofenceIn(p, g)) {
+            deviceEvents.push(createEvent('geofenceIn', d.id, p, g))
+          }
+        }
+        return
+      }
       const previous = array[i - 1]
       for (const g of geofencesFeatures) {
         if (checkGeofenceEnter(previous, p, g)) {
-          events.push(createEvent('geofenceEnter', d.id, p, g))
+          deviceEvents.push(createEvent('geofenceEnter', d.id, p, g))
         } else if (checkGeofenceExit(previous, p, g)) {
-          events.push(createEvent('geofenceExit', d.id, p, g))
+          deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
         }
       }
     })
+    events.push(...deviceEvents)
   })
   return events
 }
@@ -447,10 +465,10 @@ async function exportZoneReportToPDF (userData, reportData) {
             convertToLocaleDateString(a.date, userData.user.attributes.lang, userData.user.attributes.timezone),
             a.firstIn ? convertToLocaleTimeString(a.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
             a.lastOut ? convertToLocaleTimeString(a.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-            a.distanceIn.toFixed(0),
-            a.timeIn ? convertMS(a.timeIn, false) : '',
-            a.distanceOut.toFixed(0),
-            a.timeOut ? convertMS(a.timeOut, false) : ''
+            a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            convertMS(a.timeIn, false),
+            a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            convertMS(a.timeOut, false)
           ]
           data.push(temp)
         })
@@ -460,8 +478,8 @@ async function exportZoneReportToPDF (userData, reportData) {
             geofenceExit(userData.user, a),
             a.stopped ? translations.report.yes : translations.report.no,
             a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
-            a.distanceIn && a.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 1 }),
-            a.distanceOut && a.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 1 }),
+            a.distanceIn && a.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
+            a.distanceOut && a.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
             a.geofenceName,
             a.driverName
           ]
@@ -472,9 +490,9 @@ async function exportZoneReportToPDF (userData, reportData) {
         ? [
             'Total:' + d.days.length,
             '', '',
-            d.days.reduce((a, b) => a + b.distanceIn, 0).toFixed(0),
+            d.days.reduce((a, b) => a + b.distanceIn, 0).toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
             '',
-            d.days.reduce((a, b) => a + b.distanceOut, 0).toFixed(0)
+            d.days.reduce((a, b) => a + b.distanceOut, 0).toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })
           ]
         : [
             'Total:' + d.geofences.length
@@ -550,8 +568,8 @@ function exportZoneReportToExcel (userData, reportData) {
             date: convertToLocaleDateString(a.date, userData.user.attributes.lang, userData.user.attributes.timezone),
             firstIn: a.firstIn ? convertToLocaleTimeString(a.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
             lastOut: a.lastOut ? convertToLocaleTimeString(a.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-            distanceIn: a.distanceIn.toFixed(0),
-            distanceOut: a.distanceOut.toFixed(0),
+            distanceIn: a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            distanceOut: a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
             timeIn: convertMS(a.timeIn),
             timeOut: convertMS(a.timeOut)
           }
@@ -564,6 +582,8 @@ function exportZoneReportToExcel (userData, reportData) {
             exit: geofenceExit(userData.user, a),
             stopped: a.stopped ? translations.report.yes : translations.report.no,
             duration: a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
+            distanceIn: a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            distanceOut: a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
             zone: a.geofenceName,
             driver: a.driverName
           }