fleetmap-reports 1.0.647 → 1.0.648

package/package.json

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

package/src/idle-report.js

@@ -8,7 +8,7 @@ const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver } = require('./util/driver')
-const { getNearestPOIs, insideGeofence, loadGroupsData} = require('./util/geofence')
+const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
 
 const fileName = 'IdleReport'
 

package/src/stop-report.js

@@ -1,7 +1,7 @@
 const { devicesToProcess, deviceName } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
-const { getNearestPOIs, insideGeofence, loadGroupsData} = require('./util/geofence')
+const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
 const { getTranslations, convertToLocaleString, convertMS, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')

package/src/util/utils.js

@@ -234,3 +234,11 @@ exports.getLogo = (user) => {
 }
 exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature
+exports.calculateDistance = (positions) => {
+  return positions.map(p => [p.longitude, p.latitude])
+    .reduce((previousValue, currentValue, currentIndex, array) => {
+      return currentIndex < array.length - 1
+        ? previousValue + distance.default(currentValue, array[currentIndex + 1])
+        : previousValue
+    }, 0) || 0
+}

package/src/zone-report.js

@@ -1,6 +1,9 @@
 const moment = require('moment')
 const automaticReports = require('./automaticReports')
-const { convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature } = require('./util/utils')
+const {
+  convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature,
+  calculateDistance
+} = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const traccarHelper = require('./util/traccar')
@@ -113,6 +116,7 @@ async function processDevices (from, to, devices, userData, data) {
                   inTime: zoneInData[a.geofenceId].position,
                   outTime: a.position,
                   totalTime: totalInTime,
+                  distance: calculateDistance(route),
                   geofenceName: geofence.name,
                   stopped: route.filter(p => !p.attributes.ignition).length > 0,
                   driverName: zoneInData[a.geofenceId].position.driverName