From 204709fc958a7a18003c2d9868735b4ba52c0726 Mon Sep 17 00:00:00 2001
From: Robert Johnstone <rob@plasticviking.com>
Date: Wed, 27 Nov 2024 11:27:07 +0800
Subject: [PATCH] address stylistic issues in the public map layer code

---
 app/src/UI/App.tsx                          |  2 +-
 app/src/UI/Map2/{Map3.tsx => PublicMap.tsx} | 42 +++++----------------
 2 files changed, 10 insertions(+), 34 deletions(-)
 rename app/src/UI/Map2/{Map3.tsx => PublicMap.tsx} (82%)

diff --git a/app/src/UI/App.tsx b/app/src/UI/App.tsx
index 9588f1a44..b893634f1 100644
--- a/app/src/UI/App.tsx
+++ b/app/src/UI/App.tsx
@@ -4,7 +4,7 @@ import { Redirect, Route, useHistory } from 'react-router-dom';
 import './App.css';
 import { Footer } from './Footer/Footer';
 import { Header } from './Header/Header';
-import { MainMap as PublicMap } from './Map2/Map3';
+import { PublicMap } from './Map2/PublicMap';
 import { Map } from './Map2/Map';
 import { LandingComponent } from './Overlay/Landing/Landing';
 import Overlay from './Overlay/Overlay';
diff --git a/app/src/UI/Map2/Map3.tsx b/app/src/UI/Map2/PublicMap.tsx
similarity index 82%
rename from app/src/UI/Map2/Map3.tsx
rename to app/src/UI/Map2/PublicMap.tsx
index ae90ea2d7..b652fef94 100644
--- a/app/src/UI/Map2/Map3.tsx
+++ b/app/src/UI/Map2/PublicMap.tsx
@@ -1,9 +1,8 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { useSelector } from 'utils/use_selector';
-import Map, { ScaleControl, NavigationControl } from 'react-map-gl/maplibre';
+import Map, { NavigationControl, ScaleControl } from 'react-map-gl/maplibre';
 import { getCurrentJWT } from 'state/sagas/auth/auth';
 import maplibregl from 'maplibre-gl';
-// import { RecordSetLayers } from './RecordSetLayers3';
 import { PublicLayer } from './PublicLayer';
 import { MOBILE } from 'state/build-time-config';
 
@@ -105,15 +104,19 @@ const mapStyleLayers: Record<string, maplibregl.LayerSpecification[]> = {
   ]
 };
 
-export const MainMap = ({ children }) => {
+export const PublicMap = ({ children }) => {
   const API_BASE = useSelector((state) => state.Configuration.current.API_BASE);
   const authenticated = useSelector((state) => state.Auth.authenticated);
   const [currentAuthHeader, setCurrentAuthHeader] = useState<string>('');
   const authHeaderRef = useRef<string>();
   authHeaderRef.current = currentAuthHeader;
-  const baseMapLayer = useSelector((state: any) => state.Map.baseMapLayer);
+  const baseMapLayer = useSelector((state) => state.Map.baseMapLayer);
   const map_center = useSelector((state) => state.Map.map_center);
 
+  if (!baseMapLayer) {
+    return null;
+  }
+
   const mapstyle_current_layer: maplibregl.LayerSpecification[] = mapStyleLayers[wmsBaseLayersValue[baseMapLayer]];
 
   /* map can have platform-specific options */
@@ -156,7 +159,7 @@ export const MainMap = ({ children }) => {
     }
     return authHeaderRef.current;
   };
-  const transformRequest = (url, resourceType) => {
+  const transformRequest: maplibregl.RequestTransformFunction = (url) => {
     if (url.includes(API_BASE)) {
       return {
         url,
@@ -184,7 +187,6 @@ export const MainMap = ({ children }) => {
           attributionControl={false}
           transformRequest={transformRequest}
           mapLib={maplibregl}
-          // interactiveLayerIds={['pmtiles-layer']}
           mapStyle={{
             ...(MOBILE && { sprite: '/assets/basemaps/sprite/sprite' }),
             glyphs: MOBILE
@@ -200,38 +202,12 @@ export const MainMap = ({ children }) => {
             layers: mapstyle_current_layer
           }}
         >
-          {/* <Source
-            id='esri-sat-label-source'
-            type='raster'
-            tiles={[
-              'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}'
-            ]}
-            tileSize={256}
-            maxzoom={18}
-          />
-          <Source
-            id='esri-sat-layer-hd'
-            type='raster'
-            tiles={[
-              "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"
-            ]}
-            tileSize={256}
-          >
-            <Layer
-              id='wms-layer'
-              type='raster'
-              source='esri-sat-layer-hd'
-            />
-          </Source> */}
-
           <ScaleControl maxWidth={80} unit="metric" position="top-left" />
           <NavigationControl position="top-left" />
 
           {!authenticated ? <PublicLayer /> : <></>}
-
-          {/* <RecordSetLayers /> */}
         </Map>
-        <div id="LoadingMap" className={!true ? 'loadingMap' : 'loadedMap'}>
+        <div id="LoadingMap" className={'loadedMap'}>
           Loading tiles...
         </div>
         {children}