Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions modules/mapbox/src/deck-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ type MaplibreRenderParameters = {
projectionMatrix: number[];
};

function getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport {
function getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport | null {
const viewState = getViewState(map);
// View is always MapView or GlobeView in this context
const view = (deck.getView(MAPBOX_VIEW_ID) || getDefaultView(map)) as MapView | GlobeView;
Expand All @@ -335,7 +335,7 @@ function getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport
width: deck.width,
height: deck.height,
viewState
}) as Viewport;
});
}

function afterRender(deck: Deck, map: Map): void {
Expand All @@ -349,7 +349,12 @@ function afterRender(deck: Deck, map: Map): void {
if (hasNonMapboxLayers || hasNonMapboxViews) {
if (mapboxViewportIdx >= 0) {
viewports = viewports.slice();
viewports[mapboxViewportIdx] = getViewport(deck, map);
const mapboxViewport = getViewport(deck, map);
if (mapboxViewport) {
viewports[mapboxViewportIdx] = mapboxViewport;
} else {
viewports.splice(mapboxViewportIdx, 1);
}
}

deck._drawLayers('mapbox-repaint', {
Expand Down
Loading