From 8d711161e0253610d6d761888f63ff9d8556c5ee Mon Sep 17 00:00:00 2001
From: Jim O'Donnell <james.odonnell@dtc.ox.ac.uk>
Date: Mon, 1 Jul 2024 16:16:57 +0100
Subject: [PATCH] refactor(frontend): shared map components (#55)

`BaseMap` and `DataMap` both depend on modules outside the `lib` directory now, so move them to the `map` directory.
---
 frontend/src/{lib/data-map => map}/BaseMap.tsx | 0
 frontend/src/{lib/data-map => map}/DataMap.tsx | 8 ++++----
 frontend/src/map/MapView.tsx                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename frontend/src/{lib/data-map => map}/BaseMap.tsx (100%)
 rename frontend/src/{lib/data-map => map}/DataMap.tsx (92%)

diff --git a/frontend/src/lib/data-map/BaseMap.tsx b/frontend/src/map/BaseMap.tsx
similarity index 100%
rename from frontend/src/lib/data-map/BaseMap.tsx
rename to frontend/src/map/BaseMap.tsx
diff --git a/frontend/src/lib/data-map/DataMap.tsx b/frontend/src/map/DataMap.tsx
similarity index 92%
rename from frontend/src/lib/data-map/DataMap.tsx
rename to frontend/src/map/DataMap.tsx
index 70420804..0dfb313b 100644
--- a/frontend/src/lib/data-map/DataMap.tsx
+++ b/frontend/src/map/DataMap.tsx
@@ -10,11 +10,11 @@ import { backgroundState, showLabelsState } from 'map/layers/layers-state';
 import { useBasemapStyle } from 'map/use-basemap-style';
 import { useInteractions } from 'lib/state/interactions/use-interactions';
 
-import { useTriggerMemo } from '../hooks/use-trigger-memo';
-import { useDataLoadTrigger } from './use-data-load-trigger';
+import { useTriggerMemo } from 'lib/hooks/use-trigger-memo';
+import { useDataLoadTrigger } from 'lib/data-map/use-data-load-trigger';
 
-import { DeckGLOverlay } from '../map/DeckGLOverlay';
-import { ViewLayer, ViewLayerParams } from './view-layers';
+import { DeckGLOverlay } from 'lib/map/DeckGLOverlay';
+import { ViewLayer, ViewLayerParams } from 'lib/data-map/view-layers';
 import { LayersList } from 'deck.gl/typed';
 
 // set a convention where the view layer id is either the first part of the deck id before the @ sign, or it's the whole id
diff --git a/frontend/src/map/MapView.tsx b/frontend/src/map/MapView.tsx
index 71657d87..bd70ba4e 100644
--- a/frontend/src/map/MapView.tsx
+++ b/frontend/src/map/MapView.tsx
@@ -1,8 +1,8 @@
 import { Suspense, useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { BaseMap } from 'lib/data-map/BaseMap';
-import { DataMap } from 'lib/data-map/DataMap';
+import { BaseMap } from './BaseMap';
+import { DataMap } from './DataMap';
 import { DataMapTooltip } from 'lib/data-map/DataMapTooltip';
 import { MapBoundsFitter, mapFitBoundsState } from 'lib/map/MapBoundsFitter';
 import { MapHud } from 'lib/map/hud/MapHud';