2 files changed, 26 insertions, 17 deletions
diff --git a/modern/src/map/GeofenceMap.js b/modern/src/map/GeofenceMap.js
index 31da290..c98a8c1 100644
--- a/modern/src/map/GeofenceMap.js
+++ b/modern/src/map/GeofenceMap.js
@@ -1,18 +1,8 @@
-import wellknown from 'wellknown';
 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 coordinates = item.area.replace(/CIRCLE|\(|\)|,/g, " ").trim().split(/ +/);
-  var options = { steps: 32, units: 'meters' };
-  let polygon = circle([Number(coordinates[1]), Number(coordinates[0])], Number(coordinates[2]), options);
-  return [item.name, polygon.geometry];
-}
+import { geofenceToFeature } from './mapUtil';
 
 const GeofenceMap = () => {
   const id = 'geofences';
@@ -81,14 +71,9 @@ 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).concat(circleFence).map(([name, geometry]) => ({
-        type: 'Feature',
-        geometry: geometry,
-        properties: { name },
-      })),
+      features: geofences.map(geofenceToFeature)
     });
   }, [geofences]);
 
diff --git a/modern/src/map/mapUtil.js b/modern/src/map/mapUtil.js
index 15f1620..e7dc032 100644
--- a/modern/src/map/mapUtil.js
+++ b/modern/src/map/mapUtil.js
@@ -1,3 +1,6 @@
+import wellknown from 'wellknown';
+import circle from '@turf/circle';
+
 export const loadImage = (url) => {
   return new Promise(imageLoaded => {
     const image = new Image();
@@ -43,3 +46,24 @@ export const reverseCoordinates = it => {
     }
   }
 }
+
+export const geofenceToFeature = (item) => {
+  if (item.area.indexOf('CIRCLE') > -1) {
+    let coordinates = item.area.replace(/CIRCLE|\(|\)|,/g, " ").trim().split(/ +/);
+    var options = { steps: 32, units: 'meters' };
+    let polygon = circle([Number(coordinates[1]), Number(coordinates[0])], Number(coordinates[2]), options);
+    return { 
+      type: 'Feature',
+      geometry: polygon.geometry,
+      properties: { name: item.name }
+    };
+  } else {
+    return { 
+      type: 'Feature',
+      geometry: reverseCoordinates(wellknown(item.area)),
+      properties: { name: item.name }
+    };
+  }
+}
+
+