npm - fleetmap-reports - Versions diffs - 1.0.387 → 1.0.390 - Mend

fleetmap-reports 1.0.387 → 1.0.390

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json CHANGED Viewed

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

package/src/util/utils.js CHANGED Viewed

@@ -62,6 +62,17 @@ function convertToFeature(geofence) {
         }
         return feature
     }
+    if(geofence.area.startsWith('CIRCLE')) {
+        const str = geofence.area.substring('CIRCLE(('.length, geofence.area.length - 2)
+        const coord_list = str.split(',')
+        const coord = coord_list[0].trim().split(' ')
+        const point = turf.point([parseFloat(coord[1]), parseFloat(coord[0])])
+        point.properties.geofence = geofence
+        point.properties.distance = coord_list[1].trim()
+        console.log(point)
+        return point
+    }
 }
 function getDates(startDate, endDate) {

package/src/zone-report.js CHANGED Viewed

@@ -66,6 +66,7 @@ async function createZoneReport(from, to, userData, traccar) {
         if (data.length) {
             allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
         }
+        deviceCount = deviceCount + slice.length
     }
     reportData.push(allData)
@@ -153,31 +154,57 @@ function getInAndOutEvents(devices, route, userData) {
         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 geofencesFeatures = userData.geofences.filter(g => g.area.startsWith('POLYGON') || g.area.startsWith('CIRCLE')).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)
+                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
+                            })
+                            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)
+                        }
                     }
-                } 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)
+                }
+                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
+                            })
+                            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)
+                        }
                     }
                 }
             })