1 files changed, 16 insertions, 17 deletions
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js
index 0ad9a69d..fa7b431a 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/PositionsMap.js
@@ -8,13 +8,14 @@ import store from '../store';
 import { useHistory } from 'react-router-dom';
 import StatusView from './StatusView';
 
-const PositionsMap = () => {
+const PositionsMap = ({ positions }) => {
   const id = 'positions';
 
   const history = useHistory();
+  const devices = useSelector(state => state.devices.items);
 
-  const createFeature = (state, position) => {
-    const device = state.devices.items[position.deviceId] || null;
+  const createFeature = (devices, position) => {
+    const device = devices[position.deviceId] || null;
     return {
       deviceId: position.deviceId,
       name: device ? device.name : '',
@@ -22,18 +23,6 @@ const PositionsMap = () => {
     }
   };
 
-  const positions = useSelector(state => ({
-    type: 'FeatureCollection',
-    features: Object.values(state.positions.items).map(position => ({
-      type: 'Feature',
-      geometry: {
-        type: 'Point',
-        coordinates: [position.longitude, position.latitude]
-      },
-      properties: createFeature(state, position),
-    })),
-  }));
-
   const onMouseEnter = () => map.getCanvas().style.cursor = 'pointer';
   const onMouseLeave = () => map.getCanvas().style.cursor = '';
 
@@ -106,8 +95,18 @@ const PositionsMap = () => {
   }, [onClickCallback]);
 
   useEffect(() => {
-    map.getSource(id).setData(positions);
-  }, [positions]);
+    map.getSource(id).setData({
+      type: 'FeatureCollection',
+      features: positions.map(position => ({
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [position.longitude, position.latitude],
+        },
+        properties: createFeature(devices, position),
+      }))
+    });
+  }, [devices, positions]);
 
   return null;
 }