fix: wrong auto-selection on split map

davwheat · Jan 10, 2024 · 7de2eb6 · 7de2eb6
1 parent 4630fbd
commit 7de2eb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/components/Maps/UkCoverageMap/Providers/CoverageProvider.ts b/src/components/Maps/UkCoverageMap/Providers/CoverageProvider.ts
@@ -74,8 +74,8 @@ export default abstract class CoverageProvider<VersionHistorySupported extends b
     }
   }
 
-  isLayerHidden(layerId: number, forceHideHidden: boolean = false): boolean {
-    if (!!this._getLayers(this._version)[layerId].hidden) {
+  isLayerHidden(layerId: string, forceHideHidden: boolean = false): boolean {
+    if (!!this._getLayers(this._version).find(l => l.label === layerId)?.hidden) {
       // Hidden
       if (forceHideHidden) return true
 
@@ -85,10 +85,6 @@ export default abstract class CoverageProvider<VersionHistorySupported extends b
     return false
   }
 
-  async getSites(centreLat: number, centreLon: number, bbox: L.LatLngBounds): Promise<ISiteItem[]> {
-    return []
-  }
-
   attributionTemplate(layerLabel: string): string {
     return `© ${layerLabel} coverage info from ${this.providerName}`
   }

diff --git a/src/components/Maps/UkCoverageMap/UkCoverageMapSplitScreen.tsx b/src/components/Maps/UkCoverageMap/UkCoverageMapSplitScreen.tsx
@@ -253,6 +253,8 @@ export default function UkCoverageMapSplitScreen() {
         })),
     )
 
+    console.log(activeProviders)
+
     const filterHiddenLayers = useIsFirstRender()
 
     function getTileVersionsForProvider(provider: CoverageProvider<boolean>) {
@@ -269,14 +271,14 @@ export default function UkCoverageMapSplitScreen() {
       return provider
         .getLayers()
         .map(l => ({ label: l.label, value: l.label }))
-        .filter((_, i) => !provider.isLayerHidden(i, filterHiddenLayers))
+        .filter(l => !provider.isLayerHidden(l.value, filterHiddenLayers))
     }
 
     useEffect(() => {
       activeProviders.forEach(({ name, layerId }) => {
         const provider = allProviders.find(p => p.providerName === name)?.provider!
 
-        if (provider.isLayerHidden(getTileLayersForProvider(provider).findIndex(l => l.value === layerId))) {
+        if (provider.isLayerHidden(getTileLayersForProvider(provider).find(l => l.value === layerId)?.value!)) {
           const firstNonHiddenLayer = provider.getLayers().find(layer => !layer.hidden)!!.label
 
           dispatch({ type: 'updateSelectedLayer', payload: { providerName: name, layerId: firstNonHiddenLayer } })
@@ -405,12 +407,6 @@ export default function UkCoverageMapSplitScreen() {
                       />
                     </div>
 
-                    {/* {provider.supportsSites && (
-                      <p className={clsx('text-speak', classes.sitesAvailable)}>
-                        This coverage map also shows the location of network sites. To see them, you must zoom in.
-                      </p>
-                    )} */}
-
                     {provider.getPageMessages().map((msg, i) => (
                       <p key={i} className={clsx('text-speak', classes.sitesAvailable)}>
                         {msg}