14 files changed, 46 insertions, 46 deletions

diff --git a/modern/src/main/MainPage.js b/modern/src/main/MainPage.js
index c6879e9c..c6a0909b 100644
--- a/modern/src/main/MainPage.js
+++ b/modern/src/main/MainPage.js
@@ -14,20 +14,20 @@ import ListIcon from '@material-ui/icons/ViewList';
 import { useDispatch, useSelector } from 'react-redux';
 import DevicesList from './DevicesList';
 import Map from '../map/core/Map';
-import SelectedDeviceMap from '../map/main/SelectedDeviceMap';
-import AccuracyMap from '../map/main/AccuracyMap';
-import GeofenceMap from '../map/main/GeofenceMap';
-import CurrentPositionsMap from '../map/main/CurrentPositionsMap';
-import CurrentLocationMap from '../map/CurrentLocationMap';
+import MapSelectedDevice from '../map/main/MapSelectedDevice';
+import MapAccuracy from '../map/main/MapAccuracy';
+import MapGeofence from '../map/main/MapGeofence';
+import MapCurrentPositions from '../map/main/MapCurrentPositions';
+import MapCurrentLocation from '../map/MapCurrentLocation';
 import BottomMenu from '../common/components/BottomMenu';
 import { useTranslation } from '../common/components/LocalizationProvider';
 import PoiMap from '../map/main/PoiMap';
 import MapPadding from '../map/MapPadding';
 import StatusCard from './StatusCard';
 import { devicesActions } from '../store';
-import DefaultCameraMap from '../map/main/DefaultCameraMap';
+import MapDefaultCamera from '../map/main/MapDefaultCamera';
 import usePersistedState from '../common/util/usePersistedState';
-import LiveRoutesMap from '../map/main/LiveRoutesMap';
+import MapLiveRoutes from '../map/main/MapLiveRoutes';
 import { useDeviceReadonly } from '../common/util/permissions';
 
 const useStyles = makeStyles((theme) => ({
@@ -140,15 +140,15 @@ const MainPage = () => {
   return (
     <div className={classes.root}>
       <Map>
-        <CurrentLocationMap />
-        <GeofenceMap />
-        <AccuracyMap />
-        {mapLiveRoutes && <LiveRoutesMap />}
-        <CurrentPositionsMap />
-        <DefaultCameraMap />
-        <SelectedDeviceMap />
+        <MapGeofence />
+        <MapAccuracy />
+        {mapLiveRoutes && <MapLiveRoutes />}
+        <MapCurrentPositions />
+        <MapDefaultCamera />
+        <MapSelectedDevice />
         <PoiMap />
       </Map>
+      <MapCurrentLocation />
       {!isTablet && <MapPadding left={parseInt(theme.dimensions.drawerWidthDesktop, 10)} />}
       <Button
         variant="contained"
diff --git a/modern/src/map/CurrentLocationMap.js b/modern/src/map/MapCurrentLocation.js
index 815cd42d..691c6be3 100644
--- a/modern/src/map/CurrentLocationMap.js
+++ b/modern/src/map/MapCurrentLocation.js
@@ -2,7 +2,7 @@ import maplibregl from 'maplibre-gl';
 import { useEffect } from 'react';
 import { map } from './core/Map';
 
-const CurrentLocationMap = () => {
+const MapCurrentLocation = () => {
   useEffect(() => {
     const control = new maplibregl.GeolocateControl({
       positionOptions: {
@@ -18,4 +18,4 @@ const CurrentLocationMap = () => {
   return null;
 };
 
-export default CurrentLocationMap;
+export default MapCurrentLocation;
diff --git a/modern/src/map/GeofenceEditMap.js b/modern/src/map/MapGeofenceEdit.js
index 0d7950a2..c64eb736 100644
--- a/modern/src/map/GeofenceEditMap.js
+++ b/modern/src/map/MapGeofenceEdit.js
@@ -34,7 +34,7 @@ const draw = new MapboxDraw({
   }],
 });
 
-const GeofenceEditMap = () => {
+const MapGeofenceEdit = () => {
   const dispatch = useDispatch();
   const history = useHistory();
 
@@ -138,4 +138,4 @@ const GeofenceEditMap = () => {
   return null;
 };
 
-export default GeofenceEditMap;
+export default MapGeofenceEdit;
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/MapPositions.js
index 2e152d34..170a6b11 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/MapPositions.js
@@ -5,7 +5,7 @@ import { map } from './core/Map';
 import { getStatusColor } from '../common/util/formatter';
 import usePersistedState from '../common/util/usePersistedState';
 
-const PositionsMap = ({ positions, onClick }) => {
+const MapPositions = ({ positions, onClick }) => {
   const id = 'positions';
   const clusters = `${id}-clusters`;
 
@@ -139,4 +139,4 @@ const PositionsMap = ({ positions, onClick }) => {
   return null;
 };
 
-export default PositionsMap;
+export default MapPositions;
diff --git a/modern/src/map/ReplayPathMap.js b/modern/src/map/MapReplayPath.js
index 224502f1..be0fcb98 100644
--- a/modern/src/map/ReplayPathMap.js
+++ b/modern/src/map/MapReplayPath.js
@@ -2,7 +2,7 @@ import maplibregl from 'maplibre-gl';
 import { useEffect } from 'react';
 import { map } from './core/Map';
 
-const ReplayPathMap = ({ positions }) => {
+const MapReplayPath = ({ positions }) => {
   const id = 'replay';
 
   useEffect(() => {
@@ -62,4 +62,4 @@ const ReplayPathMap = ({ positions }) => {
   return null;
 };
 
-export default ReplayPathMap;
+export default MapReplayPath;
diff --git a/modern/src/map/main/AccuracyMap.js b/modern/src/map/main/MapAccuracy.js
index 870df38f..11ea64ed 100644
--- a/modern/src/map/main/AccuracyMap.js
+++ b/modern/src/map/main/MapAccuracy.js
@@ -4,7 +4,7 @@ import circle from '@turf/circle';
 
 import { map } from '../core/Map';
 
-const AccuracyMap = () => {
+const MapAccuracy = () => {
   const id = 'accuracy';
 
   const positions = useSelector((state) => ({
@@ -52,4 +52,4 @@ const AccuracyMap = () => {
   return null;
 };
 
-export default AccuracyMap;
+export default MapAccuracy;
diff --git a/modern/src/map/main/CurrentPositionsMap.js b/modern/src/map/main/MapCurrentPositions.js
index 76a0a0b9..ff05d2d1 100644
--- a/modern/src/map/main/CurrentPositionsMap.js
+++ b/modern/src/map/main/MapCurrentPositions.js
@@ -2,9 +2,9 @@ import React, { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { devicesActions } from '../../store';
-import PositionsMap from '../PositionsMap';
+import MapPositions from '../MapPositions';
 
-const CurrentPositionsMap = () => {
+const MapCurrentPositions = () => {
   const dispatch = useDispatch();
 
   const onClick = useCallback((_, deviceId) => {
@@ -12,7 +12,7 @@ const CurrentPositionsMap = () => {
   }, [dispatch]);
 
   const positions = useSelector((state) => state.positions.items);
-  return (<PositionsMap positions={Object.values(positions)} onClick={onClick} />);
+  return (<MapPositions positions={Object.values(positions)} onClick={onClick} />);
 };
 
-export default CurrentPositionsMap;
+export default MapCurrentPositions;
diff --git a/modern/src/map/main/DefaultCameraMap.js b/modern/src/map/main/MapDefaultCamera.js
index 256fbd04..24296c2f 100644
--- a/modern/src/map/main/DefaultCameraMap.js
+++ b/modern/src/map/main/MapDefaultCamera.js
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { usePreference } from '../../common/util/preferences';
 import { map } from '../core/Map';
 
-const DefaultCameraMap = () => {
+const MapDefaultCamera = () => {
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
   const positions = useSelector((state) => state.positions.items);
 
@@ -49,4 +49,4 @@ const DefaultCameraMap = () => {
   return null;
 };
 
-export default DefaultCameraMap;
+export default MapDefaultCamera;
diff --git a/modern/src/map/main/GeofenceMap.js b/modern/src/map/main/MapGeofence.js
index c0912cb2..ee1bc884 100644
--- a/modern/src/map/main/GeofenceMap.js
+++ b/modern/src/map/main/MapGeofence.js
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { map } from '../core/Map';
 import { geofenceToFeature } from '../core/mapUtil';
 
-const GeofenceMap = () => {
+const MapGeofence = () => {
   const id = 'geofences';
 
   const geofences = useSelector((state) => state.geofences.items);
@@ -81,4 +81,4 @@ const GeofenceMap = () => {
   return null;
 };
 
-export default GeofenceMap;
+export default MapGeofence;
diff --git a/modern/src/map/main/LiveRoutesMap.js b/modern/src/map/main/MapLiveRoutes.js
index 5c629d86..6e79d7af 100644
--- a/modern/src/map/main/LiveRoutesMap.js
+++ b/modern/src/map/main/MapLiveRoutes.js
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { map } from '../core/Map';
 import { usePrevious } from '../../reactHelper';
 
-const LiveRoutesMap = () => {
+const MapLiveRoutes = () => {
   const id = 'liveRoute';
 
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
@@ -77,4 +77,4 @@ const LiveRoutesMap = () => {
   return null;
 };
 
-export default LiveRoutesMap;
+export default MapLiveRoutes;
diff --git a/modern/src/map/main/SelectedDeviceMap.js b/modern/src/map/main/MapSelectedDevice.js
index 250be372..ba3bc784 100644
--- a/modern/src/map/main/SelectedDeviceMap.js
+++ b/modern/src/map/main/MapSelectedDevice.js
@@ -6,7 +6,7 @@ import { map } from '../core/Map';
 import { usePrevious } from '../../reactHelper';
 import usePersistedState from '../../common/util/usePersistedState';
 
-const SelectedDeviceMap = () => {
+const MapSelectedDevice = () => {
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
   const previousDeviceId = usePrevious(selectedDeviceId);
 
@@ -27,4 +27,4 @@ const SelectedDeviceMap = () => {
   return null;
 };
 
-export default SelectedDeviceMap;
+export default MapSelectedDevice;
diff --git a/modern/src/other/EventPage.js b/modern/src/other/EventPage.js
index 7bcf90a8..8174de5a 100644
--- a/modern/src/other/EventPage.js
+++ b/modern/src/other/EventPage.js
@@ -9,7 +9,7 @@ import ContainerDimensions from 'react-container-dimensions';
 import { useEffectAsync } from '../reactHelper';
 import { useTranslation } from '../common/components/LocalizationProvider';
 import Map from '../map/core/Map';
-import PositionsMap from '../map/PositionsMap';
+import MapPositions from '../map/MapPositions';
 
 const useStyles = makeStyles(() => ({
   root: {
@@ -70,7 +70,7 @@ const EventPage = () => {
       <div className={classes.mapContainer}>
         <ContainerDimensions>
           <Map>
-            {position && <PositionsMap positions={[position]} />}
+            {position && <MapPositions positions={[position]} />}
           </Map>
         </ContainerDimensions>
       </div>
diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js
index 900571e1..1e866de6 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.js
@@ -8,8 +8,8 @@ import ContainerDimensions from 'react-container-dimensions';
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
 import { useHistory } from 'react-router-dom';
 import Map from '../map/core/Map';
-import CurrentLocationMap from '../map/CurrentLocationMap';
-import GeofenceEditMap from '../map/GeofenceEditMap';
+import MapCurrentLocation from '../map/MapCurrentLocation';
+import MapGeofenceEdit from '../map/MapGeofenceEdit';
 import GeofencesList from './GeofencesList';
 import { useTranslation } from '../common/components/LocalizationProvider';
 import dimensions from '../common/theme/dimensions';
@@ -79,8 +79,8 @@ const GeofencesPage = () => {
         <div className={classes.mapContainer}>
           <ContainerDimensions>
             <Map>
-              <CurrentLocationMap />
-              <GeofenceEditMap />
+              <MapCurrentLocation />
+              <MapGeofenceEdit />
             </Map>
           </ContainerDimensions>
         </div>
diff --git a/modern/src/other/ReplayPage.js b/modern/src/other/ReplayPage.js
index c1c56ac1..5e759d7e 100644
--- a/modern/src/other/ReplayPage.js
+++ b/modern/src/other/ReplayPage.js
@@ -13,8 +13,8 @@ import FastRewindIcon from '@material-ui/icons/FastRewind';
 import { useHistory } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import Map from '../map/core/Map';
-import ReplayPathMap from '../map/ReplayPathMap';
-import PositionsMap from '../map/PositionsMap';
+import MapReplayPath from '../map/MapReplayPath';
+import MapPositions from '../map/MapPositions';
 import { formatTime } from '../common/util/formatter';
 import ReportFilter from '../reports/components/ReportFilter';
 import { useTranslation } from '../common/components/LocalizationProvider';
@@ -138,9 +138,9 @@ const ReplayPage = () => {
   return (
     <div className={classes.root}>
       <Map>
-        <ReplayPathMap positions={positions} />
+        <MapReplayPath positions={positions} />
         {index < positions.length && (
-          <PositionsMap positions={[positions[index]]} onClick={onClick} />
+          <MapPositions positions={[positions[index]]} onClick={onClick} />
         )}
       </Map>
       <div className={classes.sidebar}>