@deck.gl/mapbox 9.3.0-alpha.5 → 9.3.0-beta.1

package/dist/deck-utils.d.ts

@@ -1,9 +1,9 @@
 import { Deck, MapView, _GlobeView as GlobeView } from '@deck.gl/core';
 import type { MapViewState } from '@deck.gl/core';
 import type { Parameters } from '@luma.gl/core';
-import type MapboxLayer from "./mapbox-layer.js";
 import type MapboxLayerGroup from "./mapbox-layer-group.js";
 import type { Map } from "./types.js";
+export declare const MAPBOX_VIEW_ID = "mapbox";
 export declare function getDeckInstance({ map, deck }: {
     map: Map & {
         __deck?: Deck<any> | null;
@@ -14,7 +14,6 @@ export declare function removeDeckInstance(map: Map & {
     __deck?: Deck | null;
 }): void;
 export declare function getDefaultParameters(map: Map, interleaved: boolean): Parameters;
-export declare function drawLayer(deck: Deck, map: Map, layer: MapboxLayer<any>, renderParameters: any): void;
 export declare function drawLayerGroup(deck: Deck, map: Map, group: MapboxLayerGroup, renderParameters: any): void;
 export declare function getProjection(map: Map): 'mercator' | 'globe';
 export declare function getDefaultView(map: Map): GlobeView | MapView;

package/dist/deck-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deck-utils.d.ts","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,UAAU,IAAI,SAAS,EAAsB,MAAM,eAAe,CAAC;AAC1F,OAAO,KAAK,EAAW,YAAY,EAAQ,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,WAAW,0BAAuB;AAC9C,OAAO,KAAK,gBAAgB,gCAA6B;AACzD,OAAO,KAAK,EAAoB,GAAG,EAAC,mBAAgB;AAepD,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,IAAI,EACL,EAAE;IACD,GAAG,EAAE,GAAG,GAAG;QAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;KAAC,CAAC;IACvC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;CACjB,GAAG,IAAI,CAAC,GAAG,CAAC,CAgDZ;AAeD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG;IAAC,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;CAAC,QAGnE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,GAAG,UAAU,CAmB/E;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,EACvB,gBAAgB,EAAE,GAAG,GACpB,IAAI,CA2BN;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,GACpB,IAAI,CAmCN;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,GAAG,OAAO,CAc5D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,OAAO,CAK5D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,GAAG;IACrD,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CA6BA"}
+{"version":3,"file":"deck-utils.d.ts","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,UAAU,IAAI,SAAS,EAAsB,MAAM,eAAe,CAAC;AAC1F,OAAO,KAAK,EAAW,YAAY,EAAQ,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,gBAAgB,gCAA6B;AACzD,OAAO,KAAK,EAAoB,GAAG,EAAC,mBAAgB;AAKpD,eAAO,MAAM,cAAc,WAAW,CAAC;AAWvC,wBAAgB,eAAe,CAAC,EAC9B,GAAG,EACH,IAAI,EACL,EAAE;IACD,GAAG,EAAE,GAAG,GAAG;QAAC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;KAAC,CAAC;IACvC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;CACjB,GAAG,IAAI,CAAC,GAAG,CAAC,CAgDZ;AAeD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG;IAAC,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;CAAC,QAGnE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,GAAG,UAAU,CAmB/E;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,gBAAgB,EACvB,gBAAgB,EAAE,GAAG,GACpB,IAAI,CAmCN;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,GAAG,OAAO,CAc5D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,OAAO,CAK5D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,GAAG;IACrD,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CA6BA"}

package/dist/deck-utils.js

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { MapView, _GlobeView as GlobeView, _flatten as flatten } from '@deck.gl/core';
+import { getLayerGroupId } from "./resolve-layer-groups.js";
 import { lngLatToWorld, unitsPerMeter } from '@math.gl/web-mercator';
-const MAPBOX_VIEW_ID = 'mapbox';
+export const MAPBOX_VIEW_ID = 'mapbox';
 // Mercator constants
 const TILE_SIZE = 512;
 const DEGREES_TO_RADIANS = Math.PI / 180;
@@ -23,7 +24,7 @@ export function getDeckInstance({ map, deck }) {
             // customRender may be subscribed by DeckGL React component to update child props
             // make sure it is still called
             // Hack - do not pass a redraw reason here to prevent the React component from clearing the context
-            // Rerender will be triggered by MapboxLayer's render()
+            // Rerender will be triggered by MapboxLayerGroup's render()
             customRender?.('');
         }
     };
@@ -90,30 +91,6 @@ export function getDefaultParameters(map, interleaved) {
     }
     return result;
 }
-export function drawLayer(deck, map, layer, renderParameters) {
-    if (!deck.isInitialized) {
-        return;
-    }
-    let { currentViewport } = deck.userData;
-    let clearStack = false;
-    if (!currentViewport) {
-        // This is the first layer drawn in this render cycle.
-        // Generate viewport from the current map state.
-        currentViewport = getViewport(deck, map, renderParameters);
-        deck.userData.currentViewport = currentViewport;
-        clearStack = true;
-    }
-    if (!currentViewport) {
-        return;
-    }
-    deck._drawLayers('mapbox-repaint', {
-        viewports: [currentViewport],
-        layerFilter: params => (!deck.props.layerFilter || deck.props.layerFilter(params)) &&
-            (layer.id === params.layer.id || params.layer.props.operation.includes('terrain')),
-        clearStack,
-        clearCanvas: false
-    });
-}
 export function drawLayerGroup(deck, map, group, renderParameters) {
     if (!deck.isInitialized) {
         return;
@@ -228,7 +205,7 @@ function getViewport(deck, map, renderParameters) {
     // View is always MapView or GlobeView in this context
     const view = (deck.getView(MAPBOX_VIEW_ID) || getDefaultView(map));
     if (renderParameters) {
-        // Called from MapboxLayer.render
+        // Called from MapboxLayerGroup.render
         // Magic number, matches mapbox-gl@>=1.3.0's projection matrix
         view.props.nearZMultiplier = 0.2;
     }
@@ -249,9 +226,9 @@ function getViewport(deck, map, renderParameters) {
     });
 }
 function afterRender(deck, map) {
-    // Draw non-Mapbox layers (layers that don't have a corresponding MapboxLayer on the map)
+    // Draw non-Mapbox layers (layers that don't have a corresponding MapboxLayerGroup on the map)
     const deckLayers = flatten(deck.props.layers, Boolean);
-    const hasNonMapboxLayers = deckLayers.some(layer => layer && !map.getLayer(layer.id));
+    const hasNonMapboxLayers = deckLayers.some(layer => layer && !map.getLayer(getLayerGroupId(layer)));
     let viewports = deck.getViewports();
     const mapboxViewportIdx = viewports.findIndex(vp => vp.id === MAPBOX_VIEW_ID);
     const hasNonMapboxViews = viewports.length > 1 || mapboxViewportIdx < 0;
@@ -269,10 +246,19 @@ function afterRender(deck, map) {
         deck._drawLayers('mapbox-repaint', {
             viewports,
             layerFilter: params => (!deck.props.layerFilter || deck.props.layerFilter(params)) &&
-                (params.viewport.id !== MAPBOX_VIEW_ID || !map.getLayer(params.layer.id)),
+                (params.viewport.id !== MAPBOX_VIEW_ID ||
+                    !map.getLayer(getLayerGroupId(params.layer))),
             clearCanvas: false
         });
     }
+    else {
+        // Even when there are no non-Mapbox layers to draw, fire lifecycle callbacks
+        // so that consumers can still track view state changes via onAfterRender
+        const device = deck.device;
+        const gl = device?.gl;
+        deck.props.onBeforeRender?.({ device, gl });
+        deck.props.onAfterRender?.({ device, gl });
+    }
     // End of render cycle, clear generated viewport
     deck.userData.currentViewport = null;
 }

package/dist/deck-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"deck-utils.js","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAO,OAAO,EAAE,UAAU,IAAI,SAAS,EAAE,QAAQ,IAAI,OAAO,EAAC,MAAM,eAAe,CAAC;AAO1F,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEnE,MAAM,cAAc,GAAG,QAAQ,CAAC;AAMhC,qBAAqB;AACrB,MAAM,SAAS,GAAG,GAAG,CAAC;AACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;AAEzC,uCAAuC;AACvC,MAAM,UAAU,eAAe,CAAC,EAC9B,GAAG,EACH,IAAI,EAIL;IACC,4CAA4C;IAC5C,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,iDAAiD;IACjD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAEjC,MAAM,SAAS,GAAG;QAChB,GAAG,IAAI,CAAC,KAAK;QACb,aAAa,EAAE,GAAG,EAAE;YAClB,GAAG,CAAC,cAAc,EAAE,CAAC;YACrB,iFAAiF;YACjF,+BAA+B;YAC/B,mGAAmG;YACnG,uDAAuD;YACvD,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC;KACF,CAAC;IACF,SAAS,CAAC,KAAK,KAAf,SAAS,CAAC,KAAK,GAAK,cAAc,CAAC,GAAG,CAAC,EAAC;IAExC,oDAAoD;IACpD,sFAAsF;IACtF,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,OAAO;QACpB,SAAS,EAAE,YAAY,CAAC,GAAG,CAAC;KAC7B,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,MAAM,GAAG,GAAG,EAAE;YACtB,MAAM,EAAE,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEzB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,IAAI,IAAI,CAAC,aAAa;YAAE,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,IAAU,EAAE,GAAiC;IACjE,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,0BAA0B;YAC1B,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,2CAA2C;YAC3C,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAClC,CAAC;IACH,CAAC,CAAC;IACF,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAiC;IAClE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IACvB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAQ,EAAE,WAAoB;IACjE,MAAM,MAAM,GAAe,WAAW;QACpC,CAAC,CAAC;YACE,iBAAiB,EAAE,IAAI;YACvB,YAAY,EAAE,YAAY;YAC1B,SAAS,EAAE,CAAC;YACZ,KAAK,EAAE,IAAI;YACX,mBAAmB,EAAE,WAAW;YAChC,mBAAmB,EAAE,qBAAqB;YAC1C,mBAAmB,EAAE,KAAK;YAC1B,mBAAmB,EAAE,qBAAqB;YAC1C,mBAAmB,EAAE,KAAK;YAC1B,mBAAmB,EAAE,KAAK;SAC3B;QACH,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC;IAC3B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAU,EACV,GAAQ,EACR,KAAuB,EACvB,gBAAqB;IAErB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,EAAC,eAAe,EAAC,GAAG,IAAI,CAAC,QAAoB,CAAC;IAClD,IAAI,UAAU,GAAY,KAAK,CAAC;IAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,sDAAsD;QACtD,gDAAgD;QAChD,eAAe,GAAG,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAqB,CAAC,eAAe,GAAG,eAAe,CAAC;QAC9D,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;QACjC,SAAS,EAAE,CAAC,eAAe,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC,EAAE,CACpB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpF,UAAU;QACV,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAU,EACV,GAAQ,EACR,KAAuB,EACvB,gBAAqB;IAErB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,EAAC,eAAe,EAAC,GAAG,IAAI,CAAC,QAAoB,CAAC;IAClD,IAAI,UAAU,GAAY,KAAK,CAAC;IAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,sDAAsD;QACtD,gDAAgD;QAChD,eAAe,GAAG,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAqB,CAAC,eAAe,GAAG,eAAe,CAAC;QAC9D,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IAED,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;QACjC,SAAS,EAAE,CAAC,eAAe,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC,EAAE;YACpB,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAiC,CAAC;YACvD,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC/E,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,UAAU;QACV,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC;IACzC,MAAM,IAAI;IACR,2BAA2B;IAC3B,UAAU,EAAE,IAAI;QAChB,yBAAyB;QACzB,UAAU,EAAE,IAAI,CAAC;IACnB,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,IAAI,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAQ;IACrC,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC;QACnC,OAAO,IAAI,SAAS,CAAC,EAAC,EAAE,EAAE,cAAc,EAAC,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,EAAC,EAAE,EAAE,cAAc,EAAC,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAQ;IASnC,MAAM,EAAC,GAAG,EAAE,GAAG,EAAC,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;IAEnC,MAAM,SAAS,GAQX;QACF,oGAAoG;QACpG,+CAA+C;QAC/C,SAAS,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG;QACpC,QAAQ,EAAE,GAAG;QACb,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE;QACnB,OAAO,EAAE,GAAG,CAAC,UAAU,EAAE;QACzB,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE;QACrB,OAAO,EAAE,GAAG,CAAC,UAAU,EAAE;QACzB,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE;KACnC,CAAC;IAEF,IAAI,GAAG,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC;QACvB,qFAAqF;QACrF,qBAAqB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAQ,EAAE,SAAuB;IAC9D,IAAI,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC7B,eAAe;QACf,MAAM,EAAC,QAAQ,EAAC,GAAG,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC9C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,oCAAoC;QACpC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;QACpC,MAAM,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,SAAS,CAAC;QAE/C,0DAA0D;QAC1D,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC;QACvC,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;QAC7C,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC;QAEvC,oHAAoH;QACpH,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QACpD,MAAM,EAAE,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,4BAA4B,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,KAAM,GAAG,kBAAkB,CAAC;QACjD,MAAM,cAAc,GAAG,GAAG,GAAG,MAAM,CAAC;QACpC,MAAM,KAAK,GACT,YAAY,GAAG,KAAK;YAClB,CAAC,CAAC,2EAA2E;gBAC3E,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,OAAO;YACrD,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,4BAA4B,CAAC;QAC/E,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAElC,MAAM,kBAAkB,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,KAAK,CAAC;QAC7E,MAAM,gBAAgB,GAAG,OAAO,GAAG,kBAAkB,CAAC;QACtD,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,gBAAgB,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,oCAAoC;SAC/B,IAAI,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;QACrD,cAAc;QACd,oCAAoC;QACpC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAYD,SAAS,WAAW,CAAC,IAAU,EAAE,GAAQ,EAAE,gBAA0B;IACnE,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACpC,sDAAsD;IACtD,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,CAAwB,CAAC;IAE1F,IAAI,gBAAgB,EAAE,CAAC;QACrB,iCAAiC;QACjC,8DAA8D;QAC9D,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC;IACnC,CAAC;IAED,kCAAkC;IAClC,kDAAkD;IAClD,qFAAqF;IACrF,MAAM,KAAK,GAAI,gBAA6C,EAAE,KAAK,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;IAC5F,MAAM,IAAI,GAAI,gBAA6C,EAAE,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC;IACzF,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,KAAK,GAAG,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;QAC/C,SAAS,CAAC,IAAI,GAAG,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/C,CAAC;IACD,iFAAiF;IAEjF,OAAO,IAAI,CAAC,YAAY,CAAC;QACvB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS;KACV,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,GAAQ;IACvC,yFAAyF;IACzF,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAY,CAAC;IAClE,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IACpC,MAAM,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,cAAc,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAExE,IAAI,kBAAkB,IAAI,iBAAiB,EAAE,CAAC;QAC5C,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;YAC3B,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC9C,IAAI,cAAc,EAAE,CAAC;gBACnB,SAAS,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE;YACjC,SAAS;YACT,WAAW,EAAE,MAAM,CAAC,EAAE,CACpB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC3D,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,cAAc,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3E,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;IAED,gDAAgD;IAC/C,IAAI,CAAC,QAAqB,CAAC,eAAe,GAAG,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,GAAQ;IACrC,IAAI,CAAC,QAAQ,CAAC;QACZ,SAAS,EAAE,YAAY,CAAC,GAAG,CAAC;KAC7B,CAAC,CAAC;IACH,8DAA8D;IAC9D,qFAAqF;IACrF,mBAAmB;IACnB,IAAI,CAAC,WAAW,CAAC,EAAC,gBAAgB,EAAE,IAAI,EAAC,CAAC,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"deck-utils.js","sourceRoot":"","sources":["../src/deck-utils.ts"],"names":[],"mappings":"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"}

package/dist/dist.dev.js

@@ -63,13 +63,96 @@ var __exports__ = (() => {
   __reExport(bundle_exports, peer_dependency_exports);
 
   // src/mapbox-overlay.ts
-  var import_core6 = __toESM(require_core(), 1);
+  var import_core5 = __toESM(require_core(), 1);
 
   // src/deck-utils.ts
+  var import_core4 = __toESM(require_core(), 1);
+
+  // src/resolve-layer-groups.ts
+  var import_core3 = __toESM(require_core(), 1);
+
+  // src/mapbox-layer-group.ts
   var import_core2 = __toESM(require_core(), 1);
+  var MapboxLayerGroup = class {
+    /* eslint-disable no-this-before-super */
+    constructor(props) {
+      (0, import_core2.assert)(props.id, "id is required");
+      this.id = props.id;
+      this.type = "custom";
+      this.renderingMode = props.renderingMode || "3d";
+      this.slot = props.slot;
+      this.beforeId = props.beforeId;
+      this.map = null;
+    }
+    /* Mapbox custom layer methods */
+    onAdd(map, gl) {
+      this.map = map;
+    }
+    render(gl, renderParameters) {
+      if (!this.map)
+        return;
+      drawLayerGroup(this.map.__deck, this.map, this, renderParameters);
+    }
+  };
+
+  // src/resolve-layer-groups.ts
+  var UNDEFINED_BEFORE_ID = "__UNDEFINED__";
+  function getLayerGroupId(layer) {
+    if (layer.props.beforeId) {
+      return `deck-layer-group-before:${layer.props.beforeId}`;
+    } else if (layer.props.slot) {
+      return `deck-layer-group-slot:${layer.props.slot}`;
+    }
+    return "deck-layer-group-last";
+  }
+  function resolveLayerGroups(map, oldLayers, newLayers) {
+    if (!map || !map.style || !map.style._loaded) {
+      return;
+    }
+    const layers = (0, import_core3._flatten)(newLayers, Boolean);
+    if (oldLayers !== newLayers) {
+      const prevLayers = (0, import_core3._flatten)(oldLayers, Boolean);
+      const prevLayerGroupIds = new Set(prevLayers.map((l) => getLayerGroupId(l)));
+      const newLayerGroupIds = new Set(layers.map((l) => getLayerGroupId(l)));
+      for (const groupId of prevLayerGroupIds) {
+        if (!newLayerGroupIds.has(groupId)) {
+          if (map.getLayer(groupId)) {
+            map.removeLayer(groupId);
+          }
+        }
+      }
+    }
+    const layerGroups = {};
+    for (const layer of layers) {
+      const groupId = getLayerGroupId(layer);
+      const mapboxGroup = map.getLayer(groupId);
+      if (mapboxGroup) {
+        const groupInstance = mapboxGroup.implementation || mapboxGroup;
+        layerGroups[groupId] = groupInstance;
+      } else {
+        const newGroup = new MapboxLayerGroup({
+          id: groupId,
+          slot: layer.props.slot,
+          beforeId: layer.props.beforeId
+        });
+        layerGroups[groupId] = newGroup;
+        map.addLayer(newGroup, layer.props.beforeId);
+      }
+    }
+    const mapLayers = map.style._order;
+    for (const [groupId, group] of Object.entries(layerGroups)) {
+      const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;
+      const expectedGroupIndex = beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
+      const currentGropupIndex = mapLayers.indexOf(groupId);
+      if (currentGropupIndex !== expectedGroupIndex - 1) {
+        const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? void 0 : beforeId;
+        map.moveLayer(groupId, moveBeforeId);
+      }
+    }
+  }
 
   // ../../node_modules/@math.gl/web-mercator/dist/assert.js
-  function assert(condition, message) {
+  function assert2(condition, message) {
     if (!condition) {
       throw new Error(message || "@math.gl/web-mercator: assertion failed.");
     }
@@ -84,8 +167,8 @@ var __exports__ = (() => {
   var EARTH_CIRCUMFERENCE = 4003e4;
   function lngLatToWorld(lngLat) {
     const [lng, lat] = lngLat;
-    assert(Number.isFinite(lng));
-    assert(Number.isFinite(lat) && lat >= -90 && lat <= 90, "invalid latitude");
+    assert2(Number.isFinite(lng));
+    assert2(Number.isFinite(lat) && lat >= -90 && lat <= 90, "invalid latitude");
     const lambda2 = lng * DEGREES_TO_RADIANS;
     const phi2 = lat * DEGREES_TO_RADIANS;
     const x = TILE_SIZE * (lambda2 + PI) / (2 * PI);
@@ -175,27 +258,6 @@ var __exports__ = (() => {
     }
     return result;
   }
-  function drawLayer(deck, map, layer, renderParameters) {
-    if (!deck.isInitialized) {
-      return;
-    }
-    let { currentViewport } = deck.userData;
-    let clearStack = false;
-    if (!currentViewport) {
-      currentViewport = getViewport(deck, map, renderParameters);
-      deck.userData.currentViewport = currentViewport;
-      clearStack = true;
-    }
-    if (!currentViewport) {
-      return;
-    }
-    deck._drawLayers("mapbox-repaint", {
-      viewports: [currentViewport],
-      layerFilter: (params) => (!deck.props.layerFilter || deck.props.layerFilter(params)) && (layer.id === params.layer.id || params.layer.props.operation.includes("terrain")),
-      clearStack,
-      clearCanvas: false
-    });
-  }
   function drawLayerGroup(deck, map, group, renderParameters) {
     if (!deck.isInitialized) {
       return;
@@ -243,9 +305,9 @@ var __exports__ = (() => {
   }
   function getDefaultView(map) {
     if (getProjection(map) === "globe") {
-      return new import_core2._GlobeView({ id: MAPBOX_VIEW_ID });
+      return new import_core4._GlobeView({ id: MAPBOX_VIEW_ID });
     }
-    return new import_core2.MapView({ id: MAPBOX_VIEW_ID });
+    return new import_core4.MapView({ id: MAPBOX_VIEW_ID });
   }
   function getViewState(map) {
     const { lng, lat } = map.getCenter();
@@ -313,8 +375,10 @@ var __exports__ = (() => {
     });
   }
   function afterRender(deck, map) {
-    const deckLayers = (0, import_core2._flatten)(deck.props.layers, Boolean);
-    const hasNonMapboxLayers = deckLayers.some((layer) => layer && !map.getLayer(layer.id));
+    const deckLayers = (0, import_core4._flatten)(deck.props.layers, Boolean);
+    const hasNonMapboxLayers = deckLayers.some(
+      (layer) => layer && !map.getLayer(getLayerGroupId(layer))
+    );
     let viewports = deck.getViewports();
     const mapboxViewportIdx = viewports.findIndex((vp) => vp.id === MAPBOX_VIEW_ID);
     const hasNonMapboxViews = viewports.length > 1 || mapboxViewportIdx < 0;
@@ -330,9 +394,14 @@ var __exports__ = (() => {
       }
       deck._drawLayers("mapbox-repaint", {
         viewports,
-        layerFilter: (params) => (!deck.props.layerFilter || deck.props.layerFilter(params)) && (params.viewport.id !== MAPBOX_VIEW_ID || !map.getLayer(params.layer.id)),
+        layerFilter: (params) => (!deck.props.layerFilter || deck.props.layerFilter(params)) && (params.viewport.id !== MAPBOX_VIEW_ID || !map.getLayer(getLayerGroupId(params.layer))),
         clearCanvas: false
       });
+    } else {
+      const device = deck.device;
+      const gl = device?.gl;
+      deck.props.onBeforeRender?.({ device, gl });
+      deck.props.onAfterRender?.({ device, gl });
     }
     deck.userData.currentViewport = null;
   }
@@ -343,188 +412,6 @@ var __exports__ = (() => {
     deck.needsRedraw({ clearRedrawFlags: true });
   }
 
-  // src/resolve-layers.ts
-  var import_core3 = __toESM(require_core(), 1);
-
-  // src/mapbox-layer.ts
-  var MapboxLayer = class {
-    /* eslint-disable no-this-before-super */
-    constructor(props) {
-      if (!props.id) {
-        throw new Error("Layer must have an unique id");
-      }
-      this.id = props.id;
-      this.type = "custom";
-      this.renderingMode = props.renderingMode || "3d";
-      this.slot = props.slot;
-      this.map = null;
-      this.props = props;
-    }
-    /* Mapbox custom layer methods */
-    onAdd(map, gl) {
-      this.map = map;
-    }
-    onRemove() {
-      this.map = null;
-    }
-    setProps(props) {
-      Object.assign(this.props, props, { id: this.id });
-    }
-    render(gl, renderParameters) {
-      if (!this.map)
-        return;
-      drawLayer(this.map.__deck, this.map, this, renderParameters);
-    }
-  };
-
-  // src/resolve-layers.ts
-  var UNDEFINED_BEFORE_ID = "__UNDEFINED__";
-  function resolveLayers(map, deck, oldLayers, newLayers) {
-    if (!map || !deck || !map.style || !map.style._loaded) {
-      return;
-    }
-    const layers = (0, import_core3._flatten)(newLayers, Boolean);
-    if (oldLayers !== newLayers) {
-      const prevLayers = (0, import_core3._flatten)(oldLayers, Boolean);
-      const prevLayerIds = new Set(prevLayers.map((l) => l.id));
-      for (const layer of layers) {
-        prevLayerIds.delete(layer.id);
-      }
-      for (const id of prevLayerIds) {
-        if (map.getLayer(id)) {
-          map.removeLayer(id);
-        }
-      }
-    }
-    for (const layer of layers) {
-      const mapboxLayer = map.getLayer(layer.id);
-      if (mapboxLayer) {
-        const layerInstance = mapboxLayer.implementation || mapboxLayer;
-        layerInstance.setProps(layer.props);
-      } else {
-        map.addLayer(
-          new MapboxLayer({
-            id: layer.id,
-            // @ts-expect-error slot is not defined in LayerProps
-            slot: layer.props.slot
-          }),
-          // @ts-expect-error beforeId is not defined in LayerProps
-          layer.props.beforeId
-        );
-      }
-    }
-    const mapLayers = map.style._order;
-    const layerGroups = {};
-    for (const layer of layers) {
-      let { beforeId } = layer.props;
-      if (!beforeId || !mapLayers.includes(beforeId)) {
-        beforeId = UNDEFINED_BEFORE_ID;
-      }
-      layerGroups[beforeId] = layerGroups[beforeId] || [];
-      layerGroups[beforeId].push(layer.id);
-    }
-    for (const beforeId in layerGroups) {
-      const layerGroup = layerGroups[beforeId];
-      let lastLayerIndex = beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
-      let lastLayerId = beforeId === UNDEFINED_BEFORE_ID ? void 0 : beforeId;
-      for (let i = layerGroup.length - 1; i >= 0; i--) {
-        const layerId = layerGroup[i];
-        const layerIndex = mapLayers.indexOf(layerId);
-        if (layerIndex !== lastLayerIndex - 1) {
-          map.moveLayer(layerId, lastLayerId);
-          if (layerIndex > lastLayerIndex) {
-            lastLayerIndex++;
-          }
-        }
-        lastLayerIndex--;
-        lastLayerId = layerId;
-      }
-    }
-  }
-
-  // src/resolve-layer-groups.ts
-  var import_core5 = __toESM(require_core(), 1);
-
-  // src/mapbox-layer-group.ts
-  var import_core4 = __toESM(require_core(), 1);
-  var MapboxLayerGroup = class {
-    /* eslint-disable no-this-before-super */
-    constructor(props) {
-      (0, import_core4.assert)(props.id, "id is required");
-      this.id = props.id;
-      this.type = "custom";
-      this.renderingMode = props.renderingMode || "3d";
-      this.slot = props.slot;
-      this.beforeId = props.beforeId;
-      this.map = null;
-    }
-    /* Mapbox custom layer methods */
-    onAdd(map, gl) {
-      this.map = map;
-    }
-    render(gl, renderParameters) {
-      if (!this.map)
-        return;
-      drawLayerGroup(this.map.__deck, this.map, this, renderParameters);
-    }
-  };
-
-  // src/resolve-layer-groups.ts
-  var UNDEFINED_BEFORE_ID2 = "__UNDEFINED__";
-  function getLayerGroupId(layer) {
-    if (layer.props.beforeId) {
-      return `deck-layer-group-before:${layer.props.beforeId}`;
-    } else if (layer.props.slot) {
-      return `deck-layer-group-slot:${layer.props.slot}`;
-    }
-    return "deck-layer-group-last";
-  }
-  function resolveLayerGroups(map, oldLayers, newLayers) {
-    if (!map || !map.style || !map.style._loaded) {
-      return;
-    }
-    const layers = (0, import_core5._flatten)(newLayers, Boolean);
-    if (oldLayers !== newLayers) {
-      const prevLayers = (0, import_core5._flatten)(oldLayers, Boolean);
-      const prevLayerGroupIds = new Set(prevLayers.map((l) => getLayerGroupId(l)));
-      const newLayerGroupIds = new Set(layers.map((l) => getLayerGroupId(l)));
-      for (const groupId of prevLayerGroupIds) {
-        if (!newLayerGroupIds.has(groupId)) {
-          if (map.getLayer(groupId)) {
-            map.removeLayer(groupId);
-          }
-        }
-      }
-    }
-    const layerGroups = {};
-    for (const layer of layers) {
-      const groupId = getLayerGroupId(layer);
-      const mapboxGroup = map.getLayer(groupId);
-      if (mapboxGroup) {
-        const groupInstance = mapboxGroup.implementation || mapboxGroup;
-        layerGroups[groupId] = groupInstance;
-      } else {
-        const newGroup = new MapboxLayerGroup({
-          id: groupId,
-          slot: layer.props.slot,
-          beforeId: layer.props.beforeId
-        });
-        layerGroups[groupId] = newGroup;
-        map.addLayer(newGroup, layer.props.beforeId);
-      }
-    }
-    const mapLayers = map.style._order;
-    for (const [groupId, group] of Object.entries(layerGroups)) {
-      const beforeId = group.beforeId || UNDEFINED_BEFORE_ID2;
-      const expectedGroupIndex = beforeId === UNDEFINED_BEFORE_ID2 ? mapLayers.length : mapLayers.indexOf(beforeId);
-      const currentGropupIndex = mapLayers.indexOf(groupId);
-      if (currentGropupIndex !== expectedGroupIndex - 1) {
-        const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID2 ? void 0 : beforeId;
-        map.moveLayer(groupId, moveBeforeId);
-      }
-    }
-  }
-
   // src/mapbox-overlay.ts
   var MapboxOverlay = class {
     constructor(props) {
@@ -533,8 +420,8 @@ var __exports__ = (() => {
         if (!this._map)
           return;
         const projection = getProjection(this._map);
-        if (projection && !this._props.views) {
-          this._deck?.setProps({ views: getDefaultView(this._map) });
+        if (projection) {
+          this._deck?.setProps({ views: this._getViews(this._map) });
         }
       };
       this._updateContainerSize = () => {
@@ -551,7 +438,7 @@ var __exports__ = (() => {
         const map = this._map;
         if (deck && map) {
           deck.setProps({
-            views: this._props.views || getDefaultView(map),
+            views: this._getViews(map),
             viewState: getViewState(map)
           });
           if (deck.isInitialized) {
@@ -623,7 +510,6 @@ var __exports__ = (() => {
       };
       const { interleaved = false } = props;
       this._interleaved = interleaved;
-      this._renderLayersInGroups = props._renderLayersInGroups || false;
       this._props = this.filterProps(props);
     }
     /** Filter out props to pass to Deck **/
@@ -643,6 +529,7 @@ var __exports__ = (() => {
       if (this._deck && this._map) {
         this._deck.setProps({
           ...this._props,
+          views: this._getViews(this._map),
           parameters: {
             ...getDefaultParameters(this._map, this._interleaved),
             ...this._props.parameters
@@ -667,11 +554,11 @@ var __exports__ = (() => {
         pointerEvents: "none"
       });
       this._container = container;
-      this._deck = new import_core6.Deck({
+      this._deck = new import_core5.Deck({
         ...this._props,
         parent: container,
         parameters: { ...getDefaultParameters(map, false), ...this._props.parameters },
-        views: this._props.views || getDefaultView(map),
+        views: this._getViews(map),
         viewState: getViewState(map)
       });
       map.on("resize", this._updateContainerSize);
@@ -690,14 +577,15 @@ var __exports__ = (() => {
     _onAddInterleaved(map) {
       const gl = map.painter.context.gl;
       if (gl instanceof WebGLRenderingContext) {
-        import_core6.log.warn(
+        import_core5.log.warn(
           "Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility"
         )();
       }
       this._deck = getDeckInstance({
         map,
-        deck: new import_core6.Deck({
+        deck: new import_core5.Deck({
           ...this._props,
+          views: this._getViews(map),
           gl,
           parameters: { ...getDefaultParameters(map, true), ...this._props.parameters }
         })
@@ -706,12 +594,8 @@ var __exports__ = (() => {
       this._resolveLayers(map, this._deck, [], this._props.layers);
       return document.createElement("div");
     }
-    _resolveLayers(map, deck, prevLayers, newLayers) {
-      if (this._renderLayersInGroups) {
-        resolveLayerGroups(map, prevLayers, newLayers);
-      } else {
-        resolveLayers(map, deck, prevLayers, newLayers);
-      }
+    _resolveLayers(map, _deck, prevLayers, newLayers) {
+      resolveLayerGroups(map, prevLayers, newLayers);
     }
     /** Called when the control is removed from a map */
     onRemove() {
@@ -750,17 +634,17 @@ var __exports__ = (() => {
     }
     /** Forwards the Deck.pickObject method */
     pickObject(params) {
-      (0, import_core6.assert)(this._deck);
+      (0, import_core5.assert)(this._deck);
       return this._deck.pickObject(params);
     }
     /** Forwards the Deck.pickMultipleObjects method */
     pickMultipleObjects(params) {
-      (0, import_core6.assert)(this._deck);
+      (0, import_core5.assert)(this._deck);
       return this._deck.pickMultipleObjects(params);
     }
     /** Forwards the Deck.pickObjects method */
     pickObjects(params) {
-      (0, import_core6.assert)(this._deck);
+      (0, import_core5.assert)(this._deck);
       return this._deck.pickObjects(params);
     }
     /** Remove from map and releases all resources */
@@ -776,6 +660,17 @@ var __exports__ = (() => {
       }
       return this._interleaved ? this._map.getCanvas() : this._deck.getCanvas();
     }
+    _getViews(map) {
+      if (!this._props.views) {
+        return getDefaultView(map);
+      }
+      const views = Array.isArray(this._props.views) ? this._props.views : [this._props.views];
+      const hasMapboxView = views.some((v) => v.id === MAPBOX_VIEW_ID);
+      if (hasMapboxView) {
+        return this._props.views;
+      }
+      return [getDefaultView(map), ...views];
+    }
   };
   return __toCommonJS(bundle_exports);
 })();