fleetmap-reports 1.0.682 → 1.0.684

package/package.json

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

package/src/activity-report.js

@@ -12,6 +12,7 @@ const traccar = require('./util/traccar')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
 const tripHelper = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
+const { getDriverData } = require('./util/driver')
 
 const fileName = 'ActivityReport'
 
@@ -255,8 +256,7 @@ function processDrivers (from, to, drivers, data, userData) {
   console.log(data)
   const driversResult = []
   drivers.forEach(d => {
-    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-    const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId)
+    const { route, trips } = getDriverData(d, data)
     trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
     if (trips.length > 0) {
       const driverData = {

package/src/idle-report.js

@@ -7,7 +7,7 @@ const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
-const { reportByDriver } = require('./util/driver')
+const { reportByDriver, getDriverData } = require('./util/driver')
 const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
 
 const fileName = 'IdleReport'
@@ -140,7 +140,7 @@ async function createIdleReportByDevice (from, to, userData, traccarInstance) {
 function processDrivers (from, to, userData, data) {
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+    const { route } = getDriverData(d, data)
 
     if (route.length > 0) {
       const idleEvents = getIdleEvents(data.route, d, userData.idleSpeedThreshold / 1.85200)

package/src/kms-report.js

@@ -13,6 +13,7 @@ const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
+const { getDriverData } = require('./util/driver')
 
 const fileName = 'KmsReport'
 
@@ -72,10 +73,8 @@ async function createKmsReportByDriver (from, to, userData, traccarInstance) {
   }
 
   const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
-  const tripsData = allInOne.trips
-  const routeData = allInOne.route
 
-  return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
+  return { drivers: processDrivers(from, to, userData, allInOne) }
 }
 
 async function createKmsReportByGroup (from, to, userData, traccarInstance) {
@@ -113,14 +112,12 @@ async function createKmsReportByGroup (from, to, userData, traccarInstance) {
 }
 
 function processDrivers (from, to, userData, data) {
-  console.log(data)
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-    const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
-            (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+    const { route, trips } = getDriverData(d, data)
+    const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
-    if (trips.length > 0) {
+    if (filteredTrips.length > 0) {
       const driverData = {
         driver: d
       }
@@ -131,7 +128,7 @@ function processDrivers (from, to, userData, data) {
           const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
           const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-          const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+          const tripsByDay = filteredTrips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
 
           driverData.days.push({
             date,
@@ -140,7 +137,7 @@ function processDrivers (from, to, userData, data) {
         }
       } else {
         driverData.summary = {
-          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: filteredTrips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
         }
       }
       driversResult.push(driverData)

package/src/location-report.js

@@ -7,7 +7,7 @@ const { convertToLocaleString, getTranslations } = require('./util/utils')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
-const { getDriverName } = require('./util/driver')
+const { getDriverName, getDriverData } = require('./util/driver')
 
 const fileName = 'LocationReport'
 
@@ -42,9 +42,8 @@ async function createLocationReportByDriver (from, to, userData, traccar) {
   }
 
   const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
-  const routeData = allInOne.route
 
-  return { drivers: processDrivers(from, to, userData, routeData) }
+  return { drivers: processDrivers(from, to, userData, allInOne) }
 }
 
 async function createLocationReportByGroup (from, to, userData, traccar) {
@@ -148,14 +147,14 @@ function processDevices (from, to, devices, data) {
   return devicesResult
 }
 
-function processDrivers (from, to, userData, route) {
+function processDrivers (from, to, userData, data) {
   const driversResult = []
   userData.drivers.forEach(d => {
-    const positions = route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-    if (positions.length > 0) {
-      positions.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
+    const { route } = getDriverData(d, data)
+    if (route.length > 0) {
+      route.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 
-      positions.forEach(p => {
+      route.forEach(p => {
         const device = userData.devices.find(d => d.id === p.deviceId)
         if (device) {
           p.vehicleName = device.name
@@ -166,7 +165,7 @@ function processDrivers (from, to, userData, route) {
         driver: d,
         from,
         to,
-        positions
+        positions: route
       }
       driversResult.push(driverData)
     }

package/src/speeding-report.js

@@ -14,6 +14,7 @@ const { insideGeofence } = require('./util/geofence')
 const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
 const { default: axios } = require('axios')
+const { getDriverName, getDriverData } = require('./util/driver')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -192,7 +193,7 @@ async function processDrivers (from, to, events, routes, userData) {
   findEventsPosition(from, to, userData.devices, events, routes, userData)
 
   userData.drivers.forEach(d => {
-    const driverEvents = events.filter(e => e.position && e.position.attributes.driverUniqueId === d.uniqueId)
+    const driverEvents = getDriverData(d, { events }).events
     if (driverEvents.length > 0) {
       driverEvents.sort((a, b) => a.positionId - b.positionId)
       driversResult.push({
@@ -254,8 +255,7 @@ function findEventsPosition (from, to, devices, events, routes, userData) {
             calculateEventData(positions, pIndex, a, d, geofence, userData)
           }
           if (a.position.attributes.driverUniqueId) {
-            const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
-            a.driver = (driver && driver.name) || a.position.attributes.driverUniqueId
+            a.driver = getDriverName(a.position.attributes.driverUniqueId, a.position.fixTime, userData)
           }
           a.deviceName = d.name
         } else {

package/src/trip-report.js

@@ -10,7 +10,7 @@ const trips = require('./util/trips')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
-const { reportByDriver, getDriverName } = require('./util/driver')
+const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
 const { getNearestPOIs } = require('./util/geofence')
 
 const fileName = 'TripReport'
@@ -216,15 +216,13 @@ function processDrivers (from, to, userData, data) {
   console.log(data)
   const driversResult = []
   userData.drivers.forEach(d => {
-    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-    let trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
-            (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
-
-    trips = trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+    const { route, trips } = getDriverData(d, data)
+    const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+    filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
     const idleEvents = getIdleEvents(data.route, d)
 
-    trips.forEach(function (trip, i) {
+    filteredTrips.forEach(function (trip, i) {
       trip.totalKms = trip.distance / 1000
 
       const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
@@ -238,12 +236,12 @@ function processDrivers (from, to, userData, data) {
       trip.stopDuration = (i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
     })
 
-    if (trips.length > 0) {
+    if (filteredTrips.length > 0) {
       const driverData = {
         driver: d,
         from,
         to,
-        trips
+        trips: filteredTrips
       }
       driversResult.push(driverData)
     }

package/src/util/driver.js

@@ -8,7 +8,7 @@ async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
   const deviceIds = []
   for (const d of drivers) {
     const events = eventsData.filter(e => {
-      return e.attributes.driverUniqueId === d.uniqueId
+      return !d.uniqueId.localeCompare(e.attributes.driverUniqueId, undefined, { sensitivity: 'base' })
     })
 
     deviceIds.push(...events.map(e => e.deviceId))
@@ -55,7 +55,8 @@ function getDriverName (driverUniqueId, date, userData) {
       return timeline.driverName
     }
 
-    const driver = userData.drivers.find(d => d.uniqueId === driverUniqueId)
+    const driver = userData.drivers.find(d => !d.uniqueId.localeCompare(driverUniqueId, undefined, { sensitivity: 'base' }))
+
     return driver
       ? driver.name + ' ' + ((driver.attributes && driver.attributes.notes) || '')
       : driverUniqueId
@@ -64,6 +65,19 @@ function getDriverName (driverUniqueId, date, userData) {
   return ''
 }
 
+function getDriverData (d, data) {
+  const route = data.route ? data.route.filter(p => !d.uniqueId.localeCompare(p.attributes.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
+  const trips = data.trips ? data.trips.filter(t => !d.uniqueId.localeCompare(t.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
+  const events = data.events ? data.events.filter(e => e.position && !d.uniqueId.localeCompare(e.position.attributes.driverUniqueId, undefined, { sensitivity: 'base' })) : undefined
+
+  return {
+    route,
+    trips,
+    events
+  }
+}
+
+exports.getDriverData = getDriverData
 exports.getDriverName = getDriverName
 exports.getDriverUniqueIdTimeline = getDriverUniqueIdTimeline
 exports.devicesByDriver = devicesByDriver

package/src/util/geofence.js

@@ -41,8 +41,8 @@ exports.checkGeofenceIn = function checkGeofenceIn (p, g) {
     case 'Polygon':
       return booleanPointInPolygon.default(p, g)
     case 'Point':
-      return distance.default(p, g, { units: 'meters' }) >= g.properties.distance
+      return distance.default(p, g, { units: 'meters' }) <= g.properties.distance
     case 'LineString':
-      return pointToLineDistance.default(p, g, { units: 'meters' }) > (g.properties.geofence.attributes.polylineDistance || 25)
+      return pointToLineDistance.default(p, g, { units: 'meters' }) < (g.properties.geofence.attributes.polylineDistance || 25)
   }
 }