fleetmap-reports 1.0.398 → 1.0.401

package/package.json

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

package/src/activity-report.js

@@ -197,15 +197,33 @@ function processDevices(from, to, devices, data, userData) {
                 }
             }
         } else {
-            summary.push(...data.summaries.filter(s => s.deviceId === d.id))
-
-            if (summary.length) {
-                summary.forEach(s => {
-                    s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
-                    s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
-                    s.startTime = deviceTrips.length && deviceTrips[0].startTime
-                    s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
+            if(!userData.allWeek && userData.weekDays && userData.dayHours) {
+                const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+                const distance = trips.reduce((a, b) => a + b.distance, 0)
+                summary.push({
+                    deviceId: d.id,
+                    averageSpeed: distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
+                    distance: distance,
+                    engineHours: trips.reduce((a, b) => a + b.duration, 0),
+                    maxSpeed: trips.reduce((a, b) => {
+                        return a > b.maxSpeed ? a : b.maxSpeed
+                    }, 0),
+                    startOdometer: trips.length ? trips[0].startOdometer : 0,
+                    endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
+                    startTime: trips.length && trips[0].startTime,
+                    endTime: trips.length && trips[trips.length - 1].endTime
                 })
+            } else {
+                summary.push(...data.summaries.filter(s => s.deviceId === d.id))
+
+                if (summary.length) {
+                    summary.forEach(s => {
+                        s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+                        s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+                        s.startTime = deviceTrips.length && deviceTrips[0].startTime
+                        s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endTime
+                    })
+                }
             }
         }
 

package/src/index.test.js

@@ -48,6 +48,8 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.trips.length, 7) // Total Trips
+    assert.equal(device.trips[0].endPOIName, 'Casa João')
+    assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
   // eslint-disable-next-line no-undef
@@ -271,7 +273,7 @@ describe('Test_Reports', function () {
     assert.equal(tripsReport.length, 1)
     const device1 = tripsReport[0].devices.find(d => d.device.id === 11681)
     assert.equal(device1.trips.length, 44) // Total Trips
-    assert.equal(device1.totalDistance, 882.801081530881) // Total Kms
+    assert.equal(device1.totalDistance, 882801.0815308811) // Total Kms
 
     const device2 = kmsReport[0].devices.find(d => d.device.id === 11681)
     assert.equal(device2.summary.distance, device1.totalDistance) // Total Kms

package/src/speeding-report.js

@@ -12,7 +12,7 @@ const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const turf = require('@turf/distance')
 const { point } = require('@turf/helpers')
-const distance = require('@turf/distance');
+const distance = require('@turf/distance')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -73,14 +73,15 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
   const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
   const routes = allInOne.route
   const events = []
-  if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
-    events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
-  } else {
-    events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
-  }
 
   if (userData.roadSpeedLimits) {
     events.push(...await getHereEvents(devices, routes, userData.maxSpeedThreshold))
+  } else {
+    if (!userData.useVehicleSpeedLimit && userData.customSpeed) {
+      events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
+    } else {
+      events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
+    }
   }
 
   if (!events.length) {

package/src/util/utils.js

@@ -32,7 +32,7 @@ function coordsDistance (lon1, lat1, lon2, lat2) {
   const from = turf.point([lon1, lat1])
   const to = turf.point([lon2, lat2])
 
-  return distance.default(from, to, 'meters')
+  return distance.default(from, to, {units: 'meters'})
 }
 
 function convertPositionToFeature (position) {

package/src/zone-report.js

@@ -175,7 +175,7 @@ function getInAndOutEvents(devices, route, userData) {
                     }
                 }
                 if(g.geometry.type === 'Point') {
-                    if (distance(p, g, 'meters') < g.properties.distance) {
+                    if (distance(p, g, {units: 'meters'}) < g.properties.distance) {
                         if (!entryMap.includes(g)) {
                             events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)