aboutsummaryrefslogtreecommitdiff
path: root/modern/src/map
diff options
context:
space:
mode:
authormikems66 <>2021-03-05 10:25:06 +0100
committermikems66 <>2021-03-05 10:25:06 +0100
commitb06183b783ee62bec91002af3fa78519323162bd (patch)
tree911f42fa288fe578402052285c9a75e8162f75d7 /modern/src/map
parent09969cd35abf839ccc8c910db04db80da0ba5f07 (diff)
downloadetbsa-traccar-web-b06183b783ee62bec91002af3fa78519323162bd.tar.gz
etbsa-traccar-web-b06183b783ee62bec91002af3fa78519323162bd.tar.bz2
etbsa-traccar-web-b06183b783ee62bec91002af3fa78519323162bd.zip
Transform circle fence to polygon fence for display
Diffstat (limited to 'modern/src/map')
-rw-r--r--modern/src/map/GeofenceMap.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/modern/src/map/GeofenceMap.js b/modern/src/map/GeofenceMap.js
index 53d951d..cdf379c 100644
--- a/modern/src/map/GeofenceMap.js
+++ b/modern/src/map/GeofenceMap.js
@@ -4,6 +4,15 @@ import { useEffect, useState } from 'react';
import { map } from './Map';
import { useEffectAsync } from '../reactHelper';
import { reverseCoordinates } from './mapUtil';
+import circle from '@turf/circle';
+
+
+const circleToPolygon = (item) => {
+ let coord = item.area.replace(/CIRCLE|\(|\)|,/g, " ").trim().split(/ +/);
+ var options = {steps: 64, units: 'meters'};
+ let c = circle([Number(coord[1]), Number(coord[0])], Number(coord[2]), options);
+ return [item.name, c.geometry];
+}
const GeofenceMap = () => {
const id = 'geofences';
@@ -72,9 +81,10 @@ const GeofenceMap = () => {
}, []);
useEffect(() => {
+ let circleFence = geofences.filter((item => item.area.indexOf('CIRCLE') > -1)).map(circleToPolygon);
map.getSource(id).setData({
type: 'FeatureCollection',
- features: geofences.map(item => [item.name, reverseCoordinates(wellknown(item.area))]).filter(([, geometry]) => !!geometry).map(([name, geometry]) => ({
+ features: geofences.map(item => [item.name, reverseCoordinates(wellknown(item.area))]).filter(([, geometry]) => !!geometry).concat(circleFence).map(([name, geometry]) => ({
type: 'Feature',
geometry: geometry,
properties: { name },