20 files changed, 46 insertions, 46 deletions
diff --git a/modern/src/EventPage.js b/modern/src/EventPage.js
index ded91ce4..2131baab 100644
--- a/modern/src/EventPage.js
+++ b/modern/src/EventPage.js
@@ -8,7 +8,7 @@ import { useHistory, useParams } from 'react-router-dom';
 import ContainerDimensions from 'react-container-dimensions';
 import { useEffectAsync } from './reactHelper';
 import { useTranslation } from './LocalizationProvider';
-import Map from './map/Map';
+import Map from './map/core/Map';
 import PositionsMap from './map/PositionsMap';
 
 const useStyles = makeStyles(() => ({
diff --git a/modern/src/GeofencesPage.js b/modern/src/GeofencesPage.js
index 42dfb6b1..a616d8f0 100644
--- a/modern/src/GeofencesPage.js
+++ b/modern/src/GeofencesPage.js
@@ -6,7 +6,7 @@ import Drawer from '@material-ui/core/Drawer';
 import ContainerDimensions from 'react-container-dimensions';
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
 import { useHistory } from 'react-router-dom';
-import Map from './map/Map';
+import Map from './map/core/Map';
 import CurrentLocationMap from './map/CurrentLocationMap';
 import GeofenceEditMap from './map/GeofenceEditMap';
 import GeofencesList from './GeofencesList';
diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js
index c8c9321f..1bb52519 100644
--- a/modern/src/MainPage.js
+++ b/modern/src/MainPage.js
@@ -13,21 +13,21 @@ import ListIcon from '@material-ui/icons/ViewList';
 
 import { useDispatch, useSelector } from 'react-redux';
 import DevicesList from './DevicesList';
-import Map from './map/Map';
-import SelectedDeviceMap from './map/SelectedDeviceMap';
-import AccuracyMap from './map/AccuracyMap';
-import GeofenceMap from './map/GeofenceMap';
-import CurrentPositionsMap from './map/CurrentPositionsMap';
+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 BottomMenu from './components/BottomMenu';
 import { useTranslation } from './LocalizationProvider';
-import PoiMap from './map/PoiMap';
+import PoiMap from './map/main/PoiMap';
 import MapPadding from './map/MapPadding';
-import StatusCard from './map/StatusCard';
+import StatusCard from './map/main/StatusCard';
 import { devicesActions } from './store';
-import DefaultCameraMap from './map/DefaultCameraMap';
+import DefaultCameraMap from './map/main/DefaultCameraMap';
 import usePersistedState from './common/usePersistedState';
-import LiveRoutesMap from './map/LiveRoutesMap';
+import LiveRoutesMap from './map/main/LiveRoutesMap';
 import { useDeviceReadonly } from './common/permissions';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/modern/src/map/CurrentLocationMap.js b/modern/src/map/CurrentLocationMap.js
index 69724ce1..815cd42d 100644
--- a/modern/src/map/CurrentLocationMap.js
+++ b/modern/src/map/CurrentLocationMap.js
@@ -1,6 +1,6 @@
 import maplibregl from 'maplibre-gl';
 import { useEffect } from 'react';
-import { map } from './Map';
+import { map } from './core/Map';
 
 const CurrentLocationMap = () => {
   useEffect(() => {
diff --git a/modern/src/map/GeofenceEditMap.js b/modern/src/map/GeofenceEditMap.js
index 25c336d1..2fa7a7b4 100644
--- a/modern/src/map/GeofenceEditMap.js
+++ b/modern/src/map/GeofenceEditMap.js
@@ -6,8 +6,8 @@ import { useCallback, useEffect } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { map } from './Map';
-import { geofenceToFeature, geometryToArea } from './mapUtil';
+import { map } from './core/Map';
+import { geofenceToFeature, geometryToArea } from './core/mapUtil';
 import { geofencesActions } from '../store';
 
 const draw = new MapboxDraw({
diff --git a/modern/src/map/MapPadding.js b/modern/src/map/MapPadding.js
index dec41b49..1a4643a9 100644
--- a/modern/src/map/MapPadding.js
+++ b/modern/src/map/MapPadding.js
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { map } from './Map';
+import { map } from './core/Map';
 
 const MapPadding = ({
   top, right, bottom, left,
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js
index 2a5be791..103c1051 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/PositionsMap.js
@@ -1,7 +1,7 @@
 import { useCallback, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { map } from './Map';
+import { map } from './core/Map';
 import { getStatusColor } from '../common/formatter';
 import { devicesActions } from '../store';
 import usePersistedState from '../common/usePersistedState';
diff --git a/modern/src/map/ReplayPathMap.js b/modern/src/map/ReplayPathMap.js
index 971c2b36..224502f1 100644
--- a/modern/src/map/ReplayPathMap.js
+++ b/modern/src/map/ReplayPathMap.js
@@ -1,6 +1,6 @@
 import maplibregl from 'maplibre-gl';
 import { useEffect } from 'react';
-import { map } from './Map';
+import { map } from './core/Map';
 
 const ReplayPathMap = ({ positions }) => {
   const id = 'replay';
diff --git a/modern/src/map/Map.js b/modern/src/map/core/Map.js
index f9cbbf87..b763dca2 100644
--- a/modern/src/map/Map.js
+++ b/modern/src/map/core/Map.js
@@ -1,19 +1,19 @@
 import 'maplibre-gl/dist/maplibre-gl.css';
-import './switcher/switcher.css';
+import '../switcher/switcher.css';
 import maplibregl from 'maplibre-gl';
 import React, {
   useRef, useLayoutEffect, useEffect, useState,
 } from 'react';
-import { SwitcherControl } from './switcher/switcher';
-import deviceCategories from '../common/deviceCategories';
+import { SwitcherControl } from '../switcher/switcher';
+import deviceCategories from '../../common/deviceCategories';
 import { prepareIcon, loadImage } from './mapUtil';
 import {
   styleCarto, styleLocationIq, styleMapbox, styleMapTiler, styleOsm,
 } from './mapStyles';
-import { useAttributePreference } from '../common/preferences';
-import palette from '../theme/palette';
-import { useTranslation } from '../LocalizationProvider';
-import usePersistedState, { savePersistedState } from '../common/usePersistedState';
+import { useAttributePreference } from '../../common/preferences';
+import palette from '../../theme/palette';
+import { useTranslation } from '../../LocalizationProvider';
+import usePersistedState, { savePersistedState } from '../../common/usePersistedState';
 
 const element = document.createElement('div');
 element.style.width = '100%';
diff --git a/modern/src/map/mapStyles.js b/modern/src/map/core/mapStyles.js
index 86813a13..86813a13 100644
--- a/modern/src/map/mapStyles.js
+++ b/modern/src/map/core/mapStyles.js
diff --git a/modern/src/map/mapUtil.js b/modern/src/map/core/mapUtil.js
index 2aa86c68..2aa86c68 100644
--- a/modern/src/map/mapUtil.js
+++ b/modern/src/map/core/mapUtil.js
diff --git a/modern/src/map/AccuracyMap.js b/modern/src/map/main/AccuracyMap.js
index 5734ee82..870df38f 100644
--- a/modern/src/map/AccuracyMap.js
+++ b/modern/src/map/main/AccuracyMap.js
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import circle from '@turf/circle';
 
-import { map } from './Map';
+import { map } from '../core/Map';
 
 const AccuracyMap = () => {
   const id = 'accuracy';
diff --git a/modern/src/map/CurrentPositionsMap.js b/modern/src/map/main/CurrentPositionsMap.js
index 874e0804..80795497 100644
--- a/modern/src/map/CurrentPositionsMap.js
+++ b/modern/src/map/main/CurrentPositionsMap.js
@@ -1,7 +1,7 @@
 import React, { } from 'react';
 import { useSelector } from 'react-redux';
 
-import PositionsMap from './PositionsMap';
+import PositionsMap from '../PositionsMap';
 
 const CurrentPositionsMap = () => {
   const positions = useSelector((state) => state.positions.items);
diff --git a/modern/src/map/DefaultCameraMap.js b/modern/src/map/main/DefaultCameraMap.js
index 9b501ce5..e8baadc4 100644
--- a/modern/src/map/DefaultCameraMap.js
+++ b/modern/src/map/main/DefaultCameraMap.js
@@ -1,8 +1,8 @@
 import maplibregl from 'maplibre-gl';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { usePreference } from '../common/preferences';
-import { map } from './Map';
+import { usePreference } from '../../common/preferences';
+import { map } from '../core/Map';
 
 const DefaultCameraMap = () => {
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
diff --git a/modern/src/map/GeofenceMap.js b/modern/src/map/main/GeofenceMap.js
index 0d27df82..c0912cb2 100644
--- a/modern/src/map/GeofenceMap.js
+++ b/modern/src/map/main/GeofenceMap.js
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 
-import { map } from './Map';
-import { geofenceToFeature } from './mapUtil';
+import { map } from '../core/Map';
+import { geofenceToFeature } from '../core/mapUtil';
 
 const GeofenceMap = () => {
   const id = 'geofences';
diff --git a/modern/src/map/LiveRoutesMap.js b/modern/src/map/main/LiveRoutesMap.js
index 3cc89774..5c629d86 100644
--- a/modern/src/map/LiveRoutesMap.js
+++ b/modern/src/map/main/LiveRoutesMap.js
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
 
 import { useSelector } from 'react-redux';
-import { map } from './Map';
-import { usePrevious } from '../reactHelper';
+import { map } from '../core/Map';
+import { usePrevious } from '../../reactHelper';
 
 const LiveRoutesMap = () => {
   const id = 'liveRoute';
diff --git a/modern/src/map/PoiMap.js b/modern/src/map/main/PoiMap.js
index c977ba31..4635148a 100644
--- a/modern/src/map/PoiMap.js
+++ b/modern/src/map/main/PoiMap.js
@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react';
 import { kml } from '@tmcw/togeojson';
 
-import { map } from './Map';
-import { useEffectAsync } from '../reactHelper';
-import { usePreference } from '../common/preferences';
+import { map } from '../core/Map';
+import { useEffectAsync } from '../../reactHelper';
+import { usePreference } from '../../common/preferences';
 
 const PoiMap = () => {
   const id = 'poi';
diff --git a/modern/src/map/SelectedDeviceMap.js b/modern/src/map/main/SelectedDeviceMap.js
index bf7e3bcd..b5392b70 100644
--- a/modern/src/map/SelectedDeviceMap.js
+++ b/modern/src/map/main/SelectedDeviceMap.js
@@ -1,10 +1,10 @@
 import { useEffect } from 'react';
 
 import { useSelector } from 'react-redux';
-import dimensions from '../theme/dimensions';
-import { map } from './Map';
-import { usePrevious } from '../reactHelper';
-import usePersistedState from '../common/usePersistedState';
+import dimensions from '../../theme/dimensions';
+import { map } from '../core/Map';
+import { usePrevious } from '../../reactHelper';
+import usePersistedState from '../../common/usePersistedState';
 
 const SelectedDeviceMap = () => {
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
diff --git a/modern/src/map/StatusCard.js b/modern/src/map/main/StatusCard.js
index 5fc3edd0..d431e647 100644
--- a/modern/src/map/StatusCard.js
+++ b/modern/src/map/main/StatusCard.js
@@ -10,12 +10,12 @@ import PublishIcon from '@material-ui/icons/Publish';
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
 
-import { useTranslation } from '../LocalizationProvider';
-import { formatStatus } from '../common/formatter';
-import RemoveDialog from '../RemoveDialog';
-import PositionValue from '../components/PositionValue';
-import dimensions from '../theme/dimensions';
-import { useDeviceReadonly, useReadonly } from '../common/permissions';
+import { useTranslation } from '../../LocalizationProvider';
+import { formatStatus } from '../../common/formatter';
+import RemoveDialog from '../../RemoveDialog';
+import PositionValue from '../../components/PositionValue';
+import dimensions from '../../theme/dimensions';
+import { useDeviceReadonly, useReadonly } from '../../common/permissions';
 
 const useStyles = makeStyles((theme) => ({
   card: {
diff --git a/modern/src/reports/ReplayPage.js b/modern/src/reports/ReplayPage.js
index 72041af8..3f05aec8 100644
--- a/modern/src/reports/ReplayPage.js
+++ b/modern/src/reports/ReplayPage.js
@@ -10,7 +10,7 @@ import FastForwardIcon from '@material-ui/icons/FastForward';
 import FastRewindIcon from '@material-ui/icons/FastRewind';
 import { useHistory } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import Map from '../map/Map';
+import Map from '../map/core/Map';
 import ReplayPathMap from '../map/ReplayPathMap';
 import PositionsMap from '../map/PositionsMap';
 import { formatTime } from '../common/formatter';