fleetmap-reports 1.0.384 → 1.0.387

package/package.json

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

package/src/index.test.js

@@ -324,4 +324,19 @@ describe('Test_Reports', function() {
         assert.equal(device.days.length, 25)
 
     }, 30000)
+ /*   it('Zone Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        const data = await report.zoneReport(new Date(2022, 3, 25, 0, 0, 0, 0),
+            new Date(2022, 3, 28, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.geofences.length, 11)
+        assert.equal(device.geofences[0].inTime.fixTime, '2022-04-25T23:48:05.000+0000')
+        assert.equal(device.geofences[0].outTime.fixTime, '2022-04-26T07:47:35.000+0000')
+        assert.equal(device.geofences[0].totalTime, '28770')
+        assert.equal(device.geofences[0].geofenceName, 'Casa João')
+    }, 30000)*/
 })

package/src/trip-report.js

@@ -46,7 +46,7 @@ async function createTripReportByDevice(from, to, userData, traccar) {
 
     let deviceCount = 0
     for(const slice of sliced) {
-        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false)
+        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
         const tripsData = allInOne.trips
         const stopsData = allInOne.stops
         const routeData = allInOne.route
@@ -62,7 +62,6 @@ async function createTripReportByDevice(from, to, userData, traccar) {
             }, userData))
         }
         deviceCount = deviceCount + slice.length
-        console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
     }
 
     return allData

package/src/util/traccar.js

@@ -65,7 +65,7 @@ async function getSummary(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
-async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary){
+async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary, currentDeviceCount = 0, totalDevices = devices.length){
     let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
     if(getRoutes)  url += `&type=route`
     if(getTrips)   url += `&type=trips`
@@ -74,6 +74,7 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
 
     const sliced = automaticReports.sliceArray(devices, 5)
     const result = []
+    let deviceCount = currentDeviceCount
     for(const chunk of sliced) {
         const requests = chunk.map(d =>
             traccar.axios.get(url + '&' + `deviceId=${d.id}`, {
@@ -81,6 +82,9 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
             withCredentials: true
         }).then(r => r.data).then(x => {
                 console.log('LOADING_MESSAGE:' + d.name)
+
+                deviceCount = deviceCount + 1
+                console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
                 return x
             }))
         result.push(...(await Promise.all(requests)))

package/src/util/utils.js

@@ -36,6 +36,34 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
     return (turf.distance(from, to, 'meters'))
 }
 
+function convertPositionToFeature(position) {
+    const point = turf.point([position.longitude,position.latitude])
+    point.properties.position = position
+    return point
+}
+
+function convertToFeature(geofence) {
+    if(geofence.area.startsWith('POLYGON')) {
+        const feature = {
+            "type": "Feature",
+            "properties": {
+                "geofence": geofence
+            },
+            "geometry": {
+                "type": "Polygon",
+                "coordinates": [[]]
+            }
+        }
+        const str = geofence.area.substring('POLYGON(('.length, geofence.area.length - 2)
+        const coord_list = str.split(',')
+        for (const i in coord_list) {
+            const coord = coord_list[i].trim().split(' ')
+            feature.geometry.coordinates[0].push([parseFloat(coord[1]), parseFloat(coord[0])])
+        }
+        return feature
+    }
+}
+
 function getDates(startDate, endDate) {
     const dates = []
     let currentDate = new Date(startDate.toISOString().split('T')[0] + ' 12:00:00.000 PM')
@@ -155,3 +183,5 @@ exports.getLogo = (user) => {
     const host = window ? window.location.hostname : getUserPartner(user).host
     return getImage(getLogoUrl(host))
 }
+exports.convertToFeature = convertToFeature
+exports.convertPositionToFeature = convertPositionToFeature

package/src/zone-report.js

@@ -1,12 +1,14 @@
 const moment = require('moment')
-const automaticReports = require("./automaticReports");
-const {convertMS, convertToLocaleString, getTranslations} = require("./util/utils")
+const automaticReports = require("./automaticReports")
+const {convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {headerFromUser} = require("./util/pdfDocument");
+const {headerFromUser} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
-const {getUserPartner} = require("fleetmap-partners");
-const {devicesToProcess} = require("./util/device");
+const {getUserPartner} = require("fleetmap-partners")
+const {devicesToProcess} = require("./util/device")
+const traccarHelper = require("./util/traccar")
+const turf = require('turf')
 
 const fileName = 'ZoneReport'
 
@@ -50,21 +52,21 @@ async function createZoneReport(from, to, userData, traccar) {
         xpert: devices.filter(d => d.attributes.xpert).length > 0
     }
 
+    const sliced = automaticReports.sliceArray(devices, 5)
 
-    const arrayOfArrays = automaticReports.sliceArray(devices)
-    let data = []
-    for (const a of arrayOfArrays) {
-        const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
-        data = data.concat(response.data)
-    }
+    let deviceCount = 0
+    for(const slice of sliced) {
+        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
+        const routeData = allInOne.route
 
-    console.log('Geofence Enter/Exit Alerts:'+data.length)
+        const data = getInAndOutEvents(slice, routeData, userData)
 
-    if(data.length === 0) {
-        return reportData
-    }
+        console.log('Geofence Enter/Exit Alerts:' + data.length)
 
-    allData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar)
+        if (data.length) {
+            allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
+        }
+    }
 
     reportData.push(allData)
 
@@ -77,14 +79,14 @@ async function processDevices(from, to, devices, drivers, geofences, data, tracc
     for (const d of devices) {
         const alerts = data.filter(t => t.deviceId===d.id)
         if(alerts.length > 0) {
-            const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
+            //const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
 
             const zoneInOutData = []
             const zoneInData = {}
-            const positions = response.data
+            //const positions = response.data
 
             alerts.forEach(a => {
-                a.position = positions.find(p => p.id === a.positionId)
+                //a.position = positions.find(p => p.id === a.positionId)
                 if (a.position) {
                     if (a.type === 'geofenceEnter') {
                         const driver = drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
@@ -144,6 +146,47 @@ async function processDevices(from, to, devices, drivers, geofences, data, tracc
     return devicesResult
 }
 
+
+function getInAndOutEvents(devices, route, userData) {
+    const events = []
+    devices.forEach(d => {
+        const deviceRoute = route.filter(p => p.deviceId === d.id)
+
+        const routePoints = deviceRoute.map(p => convertPositionToFeature(p))
+        const geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON')).map(g => convertToFeature(g))
+
+        const entryMap = []
+        routePoints.forEach(p => {
+            geofencesFeatures.forEach(g => {
+                if(turf.inside(p, g)) {
+                    if(!entryMap.includes(g)) {
+                        events.push({
+                            type: "geofenceEnter",
+                            position: p.properties.position,
+                            geofenceId: g.properties.geofence.id,
+                            deviceId: d.id
+                        })
+                        entryMap.push(g)
+                    }
+                } else {
+                    if(entryMap.includes(g)) {
+                        events.push({
+                            type: "geofenceExit",
+                            position: p.properties.position,
+                            geofenceId: g.properties.geofence.id,
+                            deviceId: d.id
+                        })
+                        const index = entryMap.indexOf(g)
+                        entryMap.splice(index, 1)
+                    }
+                }
+            })
+        })
+    })
+
+    return events
+}
+
 async function exportZoneReportToPDF(userData, reportData) {
     console.log('Export to PDF')