fleetmap-reports 1.0.419 → 1.0.422

package/package.json

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

package/src/index.test.js

@@ -52,6 +52,21 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
+  it('Trip without addresses', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await report.tripReport(new Date(2022, 4, 27, 0, 0, 0, 0),
+      new Date(2022, 4, 27, 23, 59, 59, 0),
+      userData)
+
+    assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 25808)
+    assert.equal(device.trips.length, 11) // Total Trips
+    console.log(device.trips[0])
+    assert.equal(device.trips[0].endAddress, 'Rua Cláudio Manoel 184-314;Vera Cruz;Vera Cruz;96880-000;BR\n')
+    assert.equal(device.trips[1].endPOIName, undefined)
+  }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip 2 by device', async () => {
     const report = await getReports()

package/src/speeding-report.js

@@ -3,16 +3,15 @@ const jsPDF = require('jspdf')
 const { convertMS, convertToLocaleString } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
-const { parse } = require('wkt')
 const { getStyle } = require('./reportStyle')
 const drivers = require('./util/driver')
 const here = require('./here')
 const { getUserPartner } = require('fleetmap-partners')
 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 { insideGeofence } = require('./util/geofence')
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -281,7 +280,7 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
     dist += distance.default(point([endEventPosition.longitude, endEventPosition.latitude]),
       point([positions[pIndex].longitude, positions[pIndex].latitude]))
     endEventPosition = positions[pIndex]
-    if (endEventPosition.speed <= alert.attributes.speedLimit || (geofence && isOutsideGeofence(geofence, endEventPosition))) {
+    if (endEventPosition.speed <= alert.attributes.speedLimit || (geofence && !insideGeofence(endEventPosition, geofence))) {
       alert.eventTime = new Date(endEventPosition.fixTime) - new Date(alert.position.fixTime)
       alert.attributes.maxSpeed = maxSpeed
       alert.distance = dist
@@ -303,12 +302,6 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
   return pIndex
 }
 
-function isOutsideGeofence (geofence, endEventPosition) {
-  const v = turf.feature(turf.flip(parse(geofence.area)))
-  const point = turf.point([endEventPosition.longitude, endEventPosition.latitude])
-  return turf.inside(point, v)
-}
-
 async function exportSpeedingReportToPDF (userData, reportData) {
   console.log('Export to PDF')
 
@@ -364,7 +357,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
         if (d.alerts[0] && !userData.byDriver) {
           doc.text(translations.report.speedLimit + ': ' + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
         }
-        d.alerts.map(a => {
+        d.alerts.forEach(a => {
           const temp = [
             getAlertDate(a, userData.user),
             a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : ''),

package/src/trip-report.js

@@ -10,6 +10,7 @@ const trips = require('./util/trips')
 const { isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
+const axios = require('axios')
 
 const fileName = 'TripReport'
 
@@ -157,6 +158,9 @@ function processDevices (from, to, devices, data, userData) {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
       }
+      if (trip.endAddress === null) {
+        axios.get(`https://main.d8z8k71nd7w8x.amplifyapp.com/?${trip.endLat},${trip.endLon}`).then(r => { trip.endAddress = r.data })
+      }
     })
 
     if (trips.length > 0) {