fleetmap-reports 1.0.390 → 1.0.393

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.390",
+  "version": "1.0.393",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -10,6 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@turf/turf": "^6.5.0",
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
     "docx": "^7.3.0",

package/src/util/utils.js

@@ -64,7 +64,7 @@ function convertToFeature(geofence) {
     }
 
     if(geofence.area.startsWith('CIRCLE')) {
-        const str = geofence.area.substring('CIRCLE(('.length, geofence.area.length - 2)
+        const str = geofence.area.substring('CIRCLE ('.length, geofence.area.length - 1)
         const coord_list = str.split(',')
         const coord = coord_list[0].trim().split(' ')
         const point = turf.point([parseFloat(coord[1]), parseFloat(coord[0])])
@@ -73,6 +73,25 @@ function convertToFeature(geofence) {
         console.log(point)
         return point
     }
+
+    if(geofence.area.startsWith('LINESTRING')) {
+        const str = geofence.area.substring('LINESTRING ('.length, geofence.area.length - 1)
+        const coord_list = str.split(',')
+        const coordinates = coord_list.map(c => {
+            const coord = c.trim().split(' ')
+            return [parseFloat(coord[1]), parseFloat(coord[0])]
+        })
+        return  {
+            "type": "Feature",
+            "properties": {
+                "geofence": geofence
+            },
+            "geometry": {
+                "type": "LineString",
+                "coordinates": coordinates
+            }
+        }
+    }
 }
 
 function getDates(startDate, endDate) {
@@ -130,7 +149,7 @@ function convertToLocaleString(value, lang, timezone){
 }
 
 function convertToLocaleDateString(value, lang, timezone){
-    if(isClientSide){
+    if(isClientSide()){
         return new Date(value).toLocaleDateString()
     } else {
         return new Date(value).toLocaleDateString(lang, {
@@ -141,7 +160,7 @@ function convertToLocaleDateString(value, lang, timezone){
 }
 
 function convertToLocaleTimeString(value, lang, timezone){
-    if(isClientSide){
+    if(isClientSide()){
         return new Date(value).toLocaleTimeString()
     } else {
         return new Date(value).toLocaleTimeString(lang, {
@@ -152,7 +171,7 @@ function convertToLocaleTimeString(value, lang, timezone){
 }
 
 function getTimezoneOffset(timezone){
-    if(isClientSide){
+    if(isClientSide()){
         return new Date().getTimezoneOffset()
     } else {
         const utcDate = new Date(new Date().toLocaleString('en-US', { timeZone: 'UTC' }))

package/src/zone-report.js

@@ -9,6 +9,7 @@ const {getUserPartner} = require("fleetmap-partners")
 const {devicesToProcess} = require("./util/device")
 const traccarHelper = require("./util/traccar")
 const turf = require('turf')
+const {pointToLineDistance} = require("@turf/turf");
 
 const fileName = 'ZoneReport'
 
@@ -147,14 +148,13 @@ 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') || g.area.startsWith('CIRCLE')).map(g => convertToFeature(g))
+        const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
 
         const entryMap = []
         routePoints.forEach(p => {
@@ -162,22 +162,12 @@ function getInAndOutEvents(devices, route, userData) {
                 if(g.geometry.type === 'Polygon') {
                     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
-                            })
+                            events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)
                         }
                     } else {
                         if (entryMap.includes(g)) {
-                            events.push({
-                                type: "geofenceExit",
-                                position: p.properties.position,
-                                geofenceId: g.properties.geofence.id,
-                                deviceId: d.id
-                            })
+                            events.push(createEvent('geofenceExit',d.id,p,g))
                             const index = entryMap.indexOf(g)
                             entryMap.splice(index, 1)
                         }
@@ -186,22 +176,26 @@ function getInAndOutEvents(devices, route, userData) {
                 if(g.geometry.type === 'Point') {
                     if (turf.distance(p, g, 'meters') < g.properties.distance) {
                         if (!entryMap.includes(g)) {
-                            events.push({
-                                type: "geofenceEnter",
-                                position: p.properties.position,
-                                geofenceId: g.properties.geofence.id,
-                                deviceId: d.id
-                            })
+                            events.push(createEvent('geofenceEnter',d.id,p,g))
+                            entryMap.push(g)
+                        }
+                    } else {
+                        if (entryMap.includes(g)) {
+                            events.push(createEvent('geofenceExit',d.id,p,g))
+                            const index = entryMap.indexOf(g)
+                            entryMap.splice(index, 1)
+                        }
+                    }
+                }
+                if(g.geometry.type === 'LineString') {
+                    if (pointToLineDistance(p, g,{units: 'meters'}) < (g.properties.geofence.attributes.polylineDistance || 25)) {
+                        if (!entryMap.includes(g)) {
+                            events.push(createEvent('geofenceEnter',d.id,p,g))
                             entryMap.push(g)
                         }
                     } else {
                         if (entryMap.includes(g)) {
-                            events.push({
-                                type: "geofenceExit",
-                                position: p.properties.position,
-                                geofenceId: g.properties.geofence.id,
-                                deviceId: d.id
-                            })
+                            events.push(createEvent('geofenceExit',d.id,p,g))
                             const index = entryMap.indexOf(g)
                             entryMap.splice(index, 1)
                         }
@@ -214,6 +208,15 @@ function getInAndOutEvents(devices, route, userData) {
     return events
 }
 
+function createEvent(type, deviceId, p, g) {
+    return {
+        type: type,
+        position: p.properties.position,
+        geofenceId: g.properties.geofence.id,
+        deviceId: deviceId
+    }
+}
+
 async function exportZoneReportToPDF(userData, reportData) {
     console.log('Export to PDF')