fleetmap-reports 1.0.680 → 1.0.681

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -1,6 +1,7 @@
 const traccar = require('../util/traccar')
 const { getIdleEvents } = require('../util/route')
-const { insideGeofence, getNearestPOIs } = require('../util/geofence')
+const { getNearestPOIs, checkGeofenceIn } = require('../util/geofence')
+const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
@@ -16,10 +17,12 @@ async function createActivityReport (from, to, userData, traccarInstance) {
 
   const notAuthGeofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, Number(process.env.AFRIQUIA_NOT_AUTH_GROUP_ID), undefined, undefined).then(r => r.data)).map(g => g.id)
   unauthorizedGeofences.push(...(userData.geofences.filter(g => notAuthGeofenceIds.includes(g.id))))
+  const unauthorizedGeofencesFeatures = unauthorizedGeofences.map(g => convertToFeature(g))
   console.log('unauthorizedGeofences', unauthorizedGeofences)
 
   const authGeofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, Number(process.env.AFRIQUIA_AUTH_GROUP_ID), undefined, undefined).then(r => r.data)).map(g => g.id)
   authorizedGeofences.push(...(userData.geofences.filter(g => authGeofenceIds.includes(g.id))))
+  const authorizedGeofencesFeatures = authorizedGeofences.map(g => convertToFeature(g))
   console.log('authorizedGeofences', authorizedGeofences)
 
   const allInOne = await traccar.getAllInOne(traccarInstance, from, to, userData.devices, true, true, true, false)
@@ -37,12 +40,19 @@ async function createActivityReport (from, to, userData, traccarInstance) {
     let authorizedStopsTime = 0
 
     stops.forEach(s => {
-      const unauthorized = unauthorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
+      const point = convertPositionToFeature({ latitude: s.latitude, longitude: s.longitude })
+      const unauthorized = unauthorizedGeofencesFeatures.find(g => {
+        const geofenceFeature = unauthorizedGeofencesFeatures.find(gF => gF.properties.geofence.id === g.id)
+        return checkGeofenceIn(point, geofenceFeature)
+      })
 
       if (unauthorized) {
         unauthorizedStops = unauthorizedStops + 1
       } else {
-        const authorized = authorizedGeofences.find(g => insideGeofence({ latitude: s.latitude, longitude: s.longitude }, g))
+        const authorized = authorizedGeofences.find(g => {
+          const geofenceFeature = authorizedGeofencesFeatures.find(gF => gF.properties.geofence.id === g.id)
+          return checkGeofenceIn(point, geofenceFeature)
+        })
 
         if (authorized) {
           authorizedStops = authorizedStops + 1

package/src/util/geofence.js

@@ -1,6 +1,9 @@
 const turf = require('@turf/helpers')
 const inside = require('@turf/boolean-point-in-polygon')
 const { coordsDistance } = require('./utils')
+const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
+const distance = require('@turf/distance')
+const pointToLineDistance = require('@turf/point-to-line-distance')
 
 exports.insideGeofence = function insideGeofence (position, geofence) {
   const coords = geofence.area.slice(9, geofence.area.length - 2).split(',')
@@ -32,3 +35,14 @@ exports.loadGroupsData = async function loadGroupsData (userData, traccarInstanc
     g.geofenceIds = (await traccarInstance.geofences.geofencesGet(undefined, undefined, undefined, g.id, undefined, undefined).then(r => r.data)).map(g => g.id)
   }
 }
+
+exports.checkGeofenceIn = function checkGeofenceIn (p, g) {
+  switch (g.geometry.type) {
+    case 'Polygon':
+      return booleanPointInPolygon.default(p, g)
+    case 'Point':
+      return distance.default(p, g, { units: 'meters' }) >= g.properties.distance
+    case 'LineString':
+      return pointToLineDistance.default(p, g, { units: 'meters' }) > (g.properties.geofence.attributes.polylineDistance || 25)
+  }
+}

package/src/zone-report.js

@@ -11,12 +11,10 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
-const pointToLineDistance = require('@turf/point-to-line-distance')
-const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
-const distance = require('@turf/distance')
 const axios = require('axios')
 const { processServerSide } = require('./util')
 const { filterPositions } = require('./util/route')
+const { checkGeofenceIn } = require('./util/geofence')
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -301,17 +299,6 @@ function checkGeofenceExit (p1, p2, g) {
   return checkGeofenceEnter(p2, p1, g)
 }
 
-function checkGeofenceIn (p, g) {
-  switch (g.geometry.type) {
-    case 'Polygon':
-      return booleanPointInPolygon.default(p, g)
-    case 'Point':
-      return distance.default(p, g, { units: 'meters' }) >= g.properties.distance
-    case 'LineString':
-      return pointToLineDistance.default(p, g, { units: 'meters' }) > (g.properties.geofence.attributes.polylineDistance || 25)
-  }
-}
-
 function getInAndOutEvents (devices, route, userData) {
   const events = []
   devices.forEach(d => {