refactor(mapbox): Remove mapboxLayers tracking from UserData

Instead of tracking MapboxLayer instances in a Set, use map.getLayer()
to check if a deck layer has a corresponding MapboxLayer on the map.
This simplifies the code since resolve-layers already creates MapboxLayer
instances with the same ID as the deck layer.

Ref: #9944

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: chrisgervang

modules/mapbox/src/deck-utils.ts

@@ -5,7 +5,6 @@
 import {Deck, MapView, _GlobeView as GlobeView, _flatten as flatten} from '@deck.gl/core';
 import type {Viewport, MapViewState, Layer} from '@deck.gl/core';
 import type {Parameters} from '@luma.gl/core';
-import type MapboxLayer from './mapbox-layer';
 import type MapboxLayerGroup from './mapbox-layer-group';
 import type {LayerOverlayProps, Map} from './types';
 
@@ -15,8 +14,6 @@ const MAPBOX_VIEW_ID = 'mapbox';
 
 type UserData = {
   currentViewport?: Viewport | null;
-  mapboxLayers: Set<MapboxLayer<any>>;
-  // mapboxVersion: {minor: number; major: number};
 };
 
 // Mercator constants
@@ -72,7 +69,6 @@ export function getDeckInstance({
 
   deck.setProps(deckProps);
 
-  (deck.userData as UserData).mapboxLayers = new Set();
   map.__deck = deck;
   map.on('render', () => {
     if (deck.isInitialized) afterRender(deck, map);
@@ -120,14 +116,6 @@ export function getDefaultParameters(map: Map, interleaved: boolean): Parameters
   return result;
 }
 
-export function addLayer(deck: Deck, layer: MapboxLayer<any>): void {
-  (deck.userData as UserData).mapboxLayers.add(layer);
-}
-
-export function removeLayer(deck: Deck, layer: MapboxLayer<any>): void {
-  (deck.userData as UserData).mapboxLayers.delete(layer);
-}
-
 export function drawLayer(
   deck: Deck,
   map: Map,
@@ -344,12 +332,9 @@ function getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport
 }
 
 function afterRender(deck: Deck, map: Map): void {
-  const {mapboxLayers} = deck.userData as UserData;
-
-  // Draw non-Mapbox layers
-  const mapboxLayerIds = Array.from(mapboxLayers, layer => layer.id);
+  // Draw non-Mapbox layers (layers that don't have a corresponding MapboxLayer on the map)
   const deckLayers = flatten(deck.props.layers, Boolean) as Layer[];
-  const hasNonMapboxLayers = deckLayers.some(layer => layer && !mapboxLayerIds.includes(layer.id));
+  const hasNonMapboxLayers = deckLayers.some(layer => layer && !map.getLayer(layer.id));
   let viewports = deck.getViewports();
   const mapboxViewportIdx = viewports.findIndex(vp => vp.id === MAPBOX_VIEW_ID);
   const hasNonMapboxViews = viewports.length > 1 || mapboxViewportIdx < 0;
@@ -364,7 +349,7 @@ function afterRender(deck: Deck, map: Map): void {
       viewports,
       layerFilter: params =>
         (!deck.props.layerFilter || deck.props.layerFilter(params)) &&
-        (params.viewport.id !== MAPBOX_VIEW_ID || !mapboxLayerIds.includes(params.layer.id)),
+        (params.viewport.id !== MAPBOX_VIEW_ID || !map.getLayer(params.layer.id)),
       clearCanvas: false
     });
   }

modules/mapbox/src/mapbox-layer.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {addLayer, removeLayer, drawLayer} from './deck-utils';
+import {drawLayer} from './deck-utils';
 import type {Map, CustomLayerInterface} from './types';
 import type {Deck, Layer} from '@deck.gl/core';
 
@@ -40,15 +40,12 @@ export default class MapboxLayer<LayerT extends Layer> implements CustomLayerInt
 
   /* Mapbox custom layer methods */
 
-  onAdd(map: MapWithDeck, gl: WebGL2RenderingContext): void {
+  onAdd(map: MapWithDeck): void {
     this.map = map;
-    addLayer(map.__deck, this);
   }
 
   onRemove(): void {
-    if (this.map) {
-      removeLayer(this.map.__deck, this);
-    }
+    this.map = null;
   }
 
   setProps(props: MapboxLayerProps<LayerT>) {