@deck.gl/mapbox 9.3.6 → 9.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +3 -0
- package/dist/index.cjs +3 -0
- package/dist/index.cjs.map +2 -2
- package/dist/resolve-layer-groups.d.ts.map +1 -1
- package/dist/resolve-layer-groups.js +3 -0
- package/dist/resolve-layer-groups.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +2 -2
- package/src/resolve-layer-groups.ts +4 -0
package/dist/dist.dev.js
CHANGED
|
@@ -143,6 +143,9 @@ var __exports__ = (() => {
|
|
|
143
143
|
for (const [groupId, group] of Object.entries(layerGroups)) {
|
|
144
144
|
const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;
|
|
145
145
|
const expectedGroupIndex = beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
|
|
146
|
+
if (expectedGroupIndex === -1) {
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
146
149
|
const currentGropupIndex = mapLayers.indexOf(groupId);
|
|
147
150
|
if (currentGropupIndex !== expectedGroupIndex - 1) {
|
|
148
151
|
const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? void 0 : beforeId;
|
package/dist/index.cjs
CHANGED
|
@@ -105,6 +105,9 @@ function resolveLayerGroups(map, oldLayers, newLayers) {
|
|
|
105
105
|
for (const [groupId, group] of Object.entries(layerGroups)) {
|
|
106
106
|
const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;
|
|
107
107
|
const expectedGroupIndex = beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
|
|
108
|
+
if (expectedGroupIndex === -1) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
108
111
|
const currentGropupIndex = mapLayers.indexOf(groupId);
|
|
109
112
|
if (currentGropupIndex !== expectedGroupIndex - 1) {
|
|
110
113
|
const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? void 0 : beforeId;
|
package/dist/index.cjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/index.ts", "../src/mapbox-overlay.ts", "../src/deck-utils.ts", "../src/resolve-layer-groups.ts", "../src/mapbox-layer-group.ts"],
|
|
4
|
-
"sourcesContent": ["// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport {default as MapboxOverlay} from './mapbox-overlay';\n\nexport type {MapboxOverlayProps} from './mapbox-overlay';\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Deck, assert, log} from '@deck.gl/core';\nimport {\n getViewState,\n getDefaultView,\n getDeckInstance,\n removeDeckInstance,\n getDefaultParameters,\n getProjection,\n MAPBOX_VIEW_ID\n} from './deck-utils';\n\nimport type {Map, IControl, MapMouseEvent, ControlPosition} from './types';\nimport type {MjolnirGestureEvent, MjolnirPointerEvent} from 'mjolnir.js';\nimport type {DeckProps, LayersList} from '@deck.gl/core';\n\nimport {resolveLayerGroups} from './resolve-layer-groups';\n\nexport type MapboxOverlayProps = Omit<\n DeckProps,\n | 'width'\n | 'height'\n | 'gl'\n | 'parent'\n | 'canvas'\n | '_customRender'\n | 'viewState'\n | 'initialViewState'\n | 'controller'\n> & {\n /**\n * deck.gl layers are inserted into mapbox-gl's layer stack, and share the same WebGL2RenderingContext as the base map.\n */\n interleaved?: boolean;\n};\n\n/**\n * Implements Mapbox [IControl](https://docs.mapbox.com/mapbox-gl-js/api/markers/#icontrol) interface\n * Renders deck.gl layers over the base map and automatically synchronizes with the map's camera\n */\nexport default class MapboxOverlay implements IControl {\n private _props: MapboxOverlayProps;\n private _deck?: Deck<any>;\n private _map?: Map;\n private _container?: HTMLDivElement;\n private _interleaved: boolean;\n private _lastMouseDownPoint?: {x: number; y: number; clientX: number; clientY: number};\n\n constructor(props: MapboxOverlayProps) {\n const {interleaved = false} = props;\n this._interleaved = interleaved;\n this._props = this.filterProps(props);\n }\n\n /** Filter out props to pass to Deck **/\n filterProps(props: MapboxOverlayProps): MapboxOverlayProps {\n const {interleaved = false, useDevicePixels, ...deckProps} = props;\n if (!interleaved && useDevicePixels !== undefined) {\n // useDevicePixels cannot be used in interleaved mode\n (deckProps as MapboxOverlayProps).useDevicePixels = useDevicePixels;\n }\n return deckProps;\n }\n\n /** Update (partial) props of the underlying Deck instance. */\n setProps(props: MapboxOverlayProps): void {\n if (this._interleaved && props.layers) {\n this._resolveLayers(this._map, this._deck, this._props.layers, props.layers);\n }\n\n Object.assign(this._props, this.filterProps(props));\n\n if (this._deck && this._map) {\n this._deck.setProps({\n ...this._props,\n views: this._getViews(this._map),\n parameters: {\n ...getDefaultParameters(this._map, this._interleaved),\n ...this._props.parameters\n }\n });\n }\n }\n\n // The local Map type is for internal typecheck only. It does not necesarily satisefy mapbox/maplibre types at runtime.\n // Do not restrict the argument type here to avoid type conflict.\n /** Called when the control is added to a map */\n onAdd(map: unknown): HTMLDivElement {\n this._map = map as Map;\n return this._interleaved ? this._onAddInterleaved(map as Map) : this._onAddOverlaid(map as Map);\n }\n\n private _onAddOverlaid(map: Map): HTMLDivElement {\n /* global document */\n const container = document.createElement('div');\n Object.assign(container.style, {\n position: 'absolute',\n left: 0,\n top: 0,\n textAlign: 'initial',\n pointerEvents: 'none'\n });\n this._container = container;\n\n this._deck = new Deck<any>({\n ...this._props,\n parent: container,\n parameters: {...getDefaultParameters(map, false), ...this._props.parameters},\n views: this._getViews(map),\n viewState: getViewState(map)\n });\n\n map.on('resize', this._updateContainerSize);\n map.on('render', this._updateViewState);\n map.on('mousedown', this._handleMouseEvent);\n map.on('dragstart', this._handleMouseEvent);\n map.on('drag', this._handleMouseEvent);\n map.on('dragend', this._handleMouseEvent);\n map.on('mousemove', this._handleMouseEvent);\n map.on('mouseout', this._handleMouseEvent);\n map.on('click', this._handleMouseEvent);\n map.on('dblclick', this._handleMouseEvent);\n\n this._updateContainerSize();\n return container;\n }\n\n private _onAddInterleaved(map: Map): HTMLDivElement {\n // @ts-ignore non-public map property\n const gl: WebGL2RenderingContext = map.painter.context.gl;\n if (gl instanceof WebGLRenderingContext) {\n log.warn(\n 'Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility'\n )();\n }\n this._deck = getDeckInstance({\n map,\n deck: new Deck({\n ...this._props,\n views: this._getViews(map),\n gl,\n parameters: {...getDefaultParameters(map, true), ...this._props.parameters}\n })\n });\n\n map.on('styledata', this._handleStyleChange);\n this._resolveLayers(map, this._deck, [], this._props.layers);\n\n return document.createElement('div');\n }\n\n private _resolveLayers(\n map: Map | undefined,\n _deck: Deck | undefined,\n prevLayers: LayersList | undefined,\n newLayers: LayersList | undefined\n ): void {\n resolveLayerGroups(map, prevLayers, newLayers);\n }\n\n /** Called when the control is removed from a map */\n onRemove(): void {\n const map = this._map;\n\n if (map) {\n if (this._interleaved) {\n this._onRemoveInterleaved(map);\n } else {\n this._onRemoveOverlaid(map);\n }\n }\n\n this._deck = undefined;\n this._map = undefined;\n this._container = undefined;\n }\n\n private _onRemoveOverlaid(map: Map): void {\n map.off('resize', this._updateContainerSize);\n map.off('render', this._updateViewState);\n map.off('mousedown', this._handleMouseEvent);\n map.off('dragstart', this._handleMouseEvent);\n map.off('drag', this._handleMouseEvent);\n map.off('dragend', this._handleMouseEvent);\n map.off('mousemove', this._handleMouseEvent);\n map.off('mouseout', this._handleMouseEvent);\n map.off('click', this._handleMouseEvent);\n map.off('dblclick', this._handleMouseEvent);\n this._deck?.finalize();\n }\n\n private _onRemoveInterleaved(map: Map): void {\n map.off('styledata', this._handleStyleChange);\n this._resolveLayers(map, this._deck, this._props.layers, []);\n removeDeckInstance(map);\n }\n\n getDefaultPosition(): ControlPosition {\n return 'top-left';\n }\n\n /** Forwards the Deck.pickObject method */\n pickObject(params: Parameters<Deck['pickObject']>[0]): ReturnType<Deck['pickObject']> {\n assert(this._deck);\n return this._deck.pickObject(params);\n }\n\n /** Forwards the Deck.pickMultipleObjects method */\n pickMultipleObjects(\n params: Parameters<Deck['pickMultipleObjects']>[0]\n ): ReturnType<Deck['pickMultipleObjects']> {\n assert(this._deck);\n return this._deck.pickMultipleObjects(params);\n }\n\n /** Forwards the Deck.pickObjects method */\n pickObjects(params: Parameters<Deck['pickObjects']>[0]): ReturnType<Deck['pickObjects']> {\n assert(this._deck);\n return this._deck.pickObjects(params);\n }\n\n /** Remove from map and releases all resources */\n finalize() {\n if (this._map) {\n this._map.removeControl(this);\n }\n }\n\n /** If interleaved: true, returns base map's canvas, otherwise forwards the Deck.getCanvas method. */\n getCanvas(): HTMLCanvasElement | null {\n if (!this._map) {\n return null;\n }\n return this._interleaved ? this._map.getCanvas() : this._deck!.getCanvas();\n }\n\n private _handleStyleChange = () => {\n this._resolveLayers(this._map, this._deck, this._props.layers, this._props.layers);\n if (!this._map) return;\n\n // getProjection() returns undefined before style is loaded\n const projection = getProjection(this._map);\n if (projection) {\n // Update views to match new projection (MapView vs GlobeView)\n this._deck?.setProps({views: this._getViews(this._map)});\n }\n };\n\n private _updateContainerSize = () => {\n if (this._map && this._container) {\n const {clientWidth, clientHeight} = this._map.getContainer();\n Object.assign(this._container.style, {\n width: `${clientWidth}px`,\n height: `${clientHeight}px`\n });\n }\n };\n\n private _getViews(map: Map) {\n if (!this._props.views) {\n return getDefaultView(map);\n }\n // Check if custom views already include a 'mapbox' view\n const views = Array.isArray(this._props.views) ? this._props.views : [this._props.views];\n const hasMapboxView = views.some((v: any) => v.id === MAPBOX_VIEW_ID);\n if (hasMapboxView) {\n return this._props.views;\n }\n // Add default 'mapbox' view to custom views for consistency with interleaved mode\n return [getDefaultView(map), ...views];\n }\n\n private _updateViewState = () => {\n const deck = this._deck;\n const map = this._map;\n if (deck && map) {\n deck.setProps({\n views: this._getViews(map),\n viewState: getViewState(map)\n });\n // Redraw immediately if view state has changed\n if (deck.isInitialized) {\n deck.redraw();\n }\n }\n };\n\n // eslint-disable-next-line complexity\n private _handleMouseEvent = (event: MapMouseEvent) => {\n const deck = this._deck;\n if (!deck || !deck.isInitialized) {\n return;\n }\n\n const mockEvent: {\n type: string;\n deltaX?: number;\n deltaY?: number;\n offsetCenter: {x: number; y: number};\n srcEvent: MapMouseEvent;\n tapCount?: number;\n } = {\n type: event.type,\n offsetCenter: event.point,\n srcEvent: event\n };\n\n const lastDown = this._lastMouseDownPoint;\n if (!event.point && lastDown) {\n // drag* events do not contain a `point` field\n mockEvent.deltaX = event.originalEvent.clientX - lastDown.clientX;\n mockEvent.deltaY = event.originalEvent.clientY - lastDown.clientY;\n mockEvent.offsetCenter = {\n x: lastDown.x + mockEvent.deltaX,\n y: lastDown.y + mockEvent.deltaY\n };\n }\n\n switch (mockEvent.type) {\n case 'mousedown':\n deck._onPointerDown(mockEvent as unknown as MjolnirPointerEvent);\n this._lastMouseDownPoint = {\n ...event.point,\n clientX: event.originalEvent.clientX,\n clientY: event.originalEvent.clientY\n };\n break;\n\n case 'dragstart':\n mockEvent.type = 'panstart';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'drag':\n mockEvent.type = 'panmove';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'dragend':\n mockEvent.type = 'panend';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'click':\n mockEvent.tapCount = 1;\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'dblclick':\n mockEvent.type = 'click';\n mockEvent.tapCount = 2;\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'mousemove':\n mockEvent.type = 'pointermove';\n deck._onPointerMove(mockEvent as unknown as MjolnirPointerEvent);\n break;\n\n case 'mouseout':\n mockEvent.type = 'pointerleave';\n deck._onPointerMove(mockEvent as unknown as MjolnirPointerEvent);\n break;\n\n default:\n return;\n }\n };\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Deck, MapView, _GlobeView as GlobeView, _flatten as flatten} from '@deck.gl/core';\nimport type {Viewport, MapViewState, Layer} from '@deck.gl/core';\nimport type {Parameters} from '@luma.gl/core';\nimport type MapboxLayerGroup from './mapbox-layer-group';\nimport type {LayerOverlayProps, Map} from './types';\nimport {getLayerGroupId} from './resolve-layer-groups';\n\nimport {lngLatToWorld, unitsPerMeter} from '@math.gl/web-mercator';\n\nexport const MAPBOX_VIEW_ID = 'mapbox';\n\ntype UserData = {\n currentViewport?: Viewport | null;\n};\n\n// Mercator constants\nconst TILE_SIZE = 512;\nconst DEGREES_TO_RADIANS = Math.PI / 180;\n\n// Create an interleaved deck instance.\nexport function getDeckInstance({\n map,\n deck\n}: {\n map: Map & {__deck?: Deck<any> | null};\n deck: Deck<any>;\n}): Deck<any> {\n // Only create one deck instance per context\n if (map.__deck) {\n return map.__deck;\n }\n\n // Only initialize certain props once per context\n const customRender = deck.props._customRender;\n const onLoad = deck.props.onLoad;\n\n const deckProps = {\n ...deck.props,\n _customRender: () => {\n map.triggerRepaint();\n // customRender may be subscribed by DeckGL React component to update child props\n // make sure it is still called\n // Hack - do not pass a redraw reason here to prevent the React component from clearing the context\n // Rerender will be triggered by MapboxLayerGroup's render()\n customRender?.('');\n }\n };\n deckProps.views ||= getDefaultView(map);\n\n // deck is using the WebGLContext created by mapbox.\n // The map and its attached luma canvas context own canvas sizing and DPR state here.\n // Deck only follows view state and avoids trying to size the shared canvas itself.\n Object.assign(deckProps, {\n width: null,\n height: null,\n touchAction: 'unset',\n viewState: getViewState(map)\n });\n if (deck.isInitialized) {\n watchMapMove(deck, map);\n } else {\n deckProps.onLoad = () => {\n onLoad?.();\n watchMapMove(deck, map);\n };\n }\n\n deck.setProps(deckProps);\n\n map.__deck = deck;\n map.on('render', () => {\n if (deck.isInitialized) afterRender(deck, map);\n });\n\n return deck;\n}\n\nfunction watchMapMove(deck: Deck, map: Map & {__deck?: Deck | null}) {\n const _handleMapMove = () => {\n if (deck.isInitialized) {\n // call view state methods\n onMapMove(deck, map);\n } else {\n // deregister itself when deck is finalized\n map.off('move', _handleMapMove);\n }\n };\n map.on('move', _handleMapMove);\n}\n\nexport function removeDeckInstance(map: Map & {__deck?: Deck | null}) {\n map.__deck?.finalize();\n map.__deck = null;\n}\n\nexport function getDefaultParameters(map: Map, interleaved: boolean): Parameters {\n const result: Parameters = interleaved\n ? {\n depthWriteEnabled: true,\n depthCompare: 'less-equal',\n depthBias: 0,\n blend: true,\n blendColorSrcFactor: 'src-alpha',\n blendColorDstFactor: 'one-minus-src-alpha',\n blendAlphaSrcFactor: 'one',\n blendAlphaDstFactor: 'one-minus-src-alpha',\n blendColorOperation: 'add',\n blendAlphaOperation: 'add'\n }\n : {};\n return result;\n}\n\nexport function drawLayerGroup(\n deck: Deck,\n map: Map,\n group: MapboxLayerGroup,\n renderParameters: any\n): void {\n if (!deck.isInitialized) {\n return;\n }\n\n let {currentViewport} = deck.userData as UserData;\n let clearStack: boolean = false;\n if (!currentViewport) {\n // This is the first layer drawn in this render cycle.\n // Generate viewport from the current map state.\n currentViewport = getViewport(deck, map, renderParameters);\n (deck.userData as UserData).currentViewport = currentViewport;\n clearStack = true;\n }\n\n if (!currentViewport) {\n return;\n }\n\n deck._drawLayers('mapbox-repaint', {\n viewports: [currentViewport],\n layerFilter: params => {\n if (deck.props.layerFilter && !deck.props.layerFilter(params)) {\n return false;\n }\n\n const layer = params.layer as Layer<LayerOverlayProps>;\n if (layer.props.beforeId === group.beforeId && layer.props.slot === group.slot) {\n return true;\n }\n return false;\n },\n clearStack,\n clearCanvas: false\n });\n}\n\nexport function getProjection(map: Map): 'mercator' | 'globe' {\n const projection = map.getProjection?.();\n const type =\n // maplibre projection spec\n projection?.type ||\n // mapbox projection spec\n projection?.name;\n if (type === 'globe') {\n return 'globe';\n }\n if (type && type !== 'mercator') {\n throw new Error('Unsupported projection');\n }\n return 'mercator';\n}\n\nexport function getDefaultView(map: Map): GlobeView | MapView {\n if (getProjection(map) === 'globe') {\n return new GlobeView({id: MAPBOX_VIEW_ID});\n }\n return new MapView({id: MAPBOX_VIEW_ID});\n}\n\nexport function getViewState(map: Map): MapViewState & {\n repeat: boolean;\n padding: {\n left: number;\n right: number;\n top: number;\n bottom: number;\n };\n} {\n const {lng, lat} = map.getCenter();\n\n const viewState: MapViewState & {\n repeat: boolean;\n padding: {\n left: number;\n right: number;\n top: number;\n bottom: number;\n };\n } = {\n // Longitude returned by getCenter can be outside of [-180, 180] when zooming near the anti meridian\n // https://github.com/visgl/deck.gl/issues/6894\n longitude: ((lng + 540) % 360) - 180,\n latitude: lat,\n zoom: map.getZoom(),\n bearing: map.getBearing(),\n pitch: map.getPitch(),\n padding: map.getPadding(),\n repeat: map.getRenderWorldCopies()\n };\n\n if (map.getTerrain?.()) {\n // When the base map has terrain, we need to target the camera at the terrain surface\n centerCameraOnTerrain(map, viewState);\n }\n\n return viewState;\n}\n\nfunction centerCameraOnTerrain(map: Map, viewState: MapViewState) {\n if (map.getFreeCameraOptions) {\n // mapbox-gl v2\n const {position} = map.getFreeCameraOptions();\n if (!position || position.z === undefined) {\n return;\n }\n\n // @ts-ignore transform is not typed\n const height = map.transform.height;\n const {longitude, latitude, pitch} = viewState;\n\n // Convert mapbox mercator coordinate to deck common space\n const cameraX = position.x * TILE_SIZE;\n const cameraY = (1 - position.y) * TILE_SIZE;\n const cameraZ = position.z * TILE_SIZE;\n\n // Mapbox manipulates zoom in terrain mode, see discussion here: https://github.com/mapbox/mapbox-gl-js/issues/12040\n const center = lngLatToWorld([longitude, latitude]);\n const dx = cameraX - center[0];\n const dy = cameraY - center[1];\n const cameraToCenterDistanceGround = Math.sqrt(dx * dx + dy * dy);\n\n const pitchRadians = pitch! * DEGREES_TO_RADIANS;\n const altitudePixels = 1.5 * height;\n const scale =\n pitchRadians < 0.001\n ? // Pitch angle too small to deduce the look at point, assume elevation is 0\n (altitudePixels * Math.cos(pitchRadians)) / cameraZ\n : (altitudePixels * Math.sin(pitchRadians)) / cameraToCenterDistanceGround;\n viewState.zoom = Math.log2(scale);\n\n const cameraZFromSurface = (altitudePixels * Math.cos(pitchRadians)) / scale;\n const surfaceElevation = cameraZ - cameraZFromSurface;\n viewState.position = [0, 0, surfaceElevation / unitsPerMeter(latitude)];\n }\n // @ts-ignore transform is not typed\n else if (typeof map.transform.elevation === 'number') {\n // maplibre-gl\n // @ts-ignore transform is not typed\n viewState.position = [0, 0, map.transform.elevation];\n }\n}\n\n// Since maplibre-gl@5\n// https://github.com/maplibre/maplibre-gl-js/blob/main/src/style/style_layer/custom_style_layer.ts\ntype MaplibreRenderParameters = {\n farZ: number;\n nearZ: number;\n fov: number;\n modelViewProjectionMatrix: number[];\n projectionMatrix: number[];\n};\n\nfunction getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport | null {\n const viewState = getViewState(map);\n // View is always MapView or GlobeView in this context\n const view = (deck.getView(MAPBOX_VIEW_ID) || getDefaultView(map)) as MapView | GlobeView;\n\n if (renderParameters) {\n // Called from MapboxLayerGroup.render\n // Magic number, matches mapbox-gl@>=1.3.0's projection matrix\n view.props.nearZMultiplier = 0.2;\n }\n\n // Get the base map near/far plane\n // renderParameters is maplibre API but not mapbox\n // Transform is not an official API, properties could be undefined for older versions\n const nearZ = (renderParameters as MaplibreRenderParameters)?.nearZ ?? map.transform._nearZ;\n const farZ = (renderParameters as MaplibreRenderParameters)?.farZ ?? map.transform._farZ;\n if (Number.isFinite(nearZ)) {\n viewState.nearZ = nearZ / map.transform.height;\n viewState.farZ = farZ / map.transform.height;\n }\n // Otherwise fallback to default calculation using nearZMultiplier/farZMultiplier\n\n return view.makeViewport({\n width: deck.width,\n height: deck.height,\n viewState\n });\n}\n\nfunction afterRender(deck: Deck, map: Map): void {\n // Draw non-Mapbox layers (layers that don't have a corresponding MapboxLayerGroup on the map)\n const deckLayers = flatten(deck.props.layers, Boolean) as Layer<LayerOverlayProps>[];\n const hasNonMapboxLayers = deckLayers.some(\n layer => layer && !map.getLayer(getLayerGroupId(layer))\n );\n let viewports = deck.getViewports();\n const mapboxViewportIdx = viewports.findIndex(vp => vp.id === MAPBOX_VIEW_ID);\n const hasNonMapboxViews = viewports.length > 1 || mapboxViewportIdx < 0;\n\n if (hasNonMapboxLayers || hasNonMapboxViews) {\n if (mapboxViewportIdx >= 0) {\n viewports = viewports.slice();\n const mapboxViewport = getViewport(deck, map);\n if (mapboxViewport) {\n viewports[mapboxViewportIdx] = mapboxViewport;\n } else {\n viewports.splice(mapboxViewportIdx, 1);\n }\n }\n\n deck._drawLayers('mapbox-repaint', {\n viewports,\n layerFilter: params =>\n (!deck.props.layerFilter || deck.props.layerFilter(params)) &&\n (params.viewport.id !== MAPBOX_VIEW_ID ||\n !map.getLayer(getLayerGroupId(params.layer as Layer<LayerOverlayProps>))),\n clearCanvas: false\n });\n } else {\n // Even when there are no non-Mapbox layers to draw, fire lifecycle callbacks\n // so that consumers can still track view state changes via onAfterRender\n const device = (deck as any).device;\n const gl = device?.gl;\n deck.props.onBeforeRender?.({device, gl});\n deck.props.onAfterRender?.({device, gl});\n }\n\n // End of render cycle, clear generated viewport\n (deck.userData as UserData).currentViewport = null;\n}\n\nfunction onMapMove(deck: Deck, map: Map): void {\n deck.setProps({\n viewState: getViewState(map)\n });\n // Camera changed, will trigger a map repaint right after this\n // Clear any change flag triggered by setting viewState so that deck does not request\n // a second repaint\n deck.needsRedraw({clearRedrawFlags: true});\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {_flatten as flatten} from '@deck.gl/core';\n\nimport type {Layer, LayersList} from '@deck.gl/core';\nimport type {Map, LayerOverlayProps} from './types';\nimport MapboxLayerGroup from './mapbox-layer-group';\n\nconst UNDEFINED_BEFORE_ID = '__UNDEFINED__';\n\nexport function getLayerGroupId(layer: Layer<LayerOverlayProps>): string {\n if (layer.props.beforeId) {\n return `deck-layer-group-before:${layer.props.beforeId}`;\n } else if (layer.props.slot) {\n return `deck-layer-group-slot:${layer.props.slot}`;\n }\n return 'deck-layer-group-last';\n}\n\n/** Group Deck layers into buckets (by beforeId or slot) and insert them\n * into the mapbox Map according to the user-defined order\n **/\n// eslint-disable-next-line complexity, max-statements\nexport function resolveLayerGroups(map?: Map, oldLayers?: LayersList, newLayers?: LayersList) {\n // Wait until map style is loaded\n // @ts-ignore non-public map property\n if (!map || !map.style || !map.style._loaded) {\n return;\n }\n\n const layers = flatten(newLayers, Boolean) as Layer<LayerOverlayProps>[];\n\n if (oldLayers !== newLayers) {\n // Step 1: remove \"group\" layers that no longer exist\n const prevLayers = flatten(oldLayers, Boolean) as Layer<LayerOverlayProps>[];\n const prevLayerGroupIds = new Set<string>(prevLayers.map(l => getLayerGroupId(l)));\n const newLayerGroupIds = new Set<string>(layers.map(l => getLayerGroupId(l)));\n\n for (const groupId of prevLayerGroupIds) {\n if (!newLayerGroupIds.has(groupId)) {\n if (map.getLayer(groupId)) {\n map.removeLayer(groupId);\n }\n }\n }\n }\n\n // Step 2: add missing \"group\" layers\n const layerGroups: Record<string, MapboxLayerGroup> = {};\n for (const layer of layers) {\n const groupId = getLayerGroupId(layer);\n const mapboxGroup = map.getLayer(groupId) as MapboxLayerGroup;\n if (mapboxGroup) {\n // Mapbox's map.getLayer() had a breaking change in v3.6.0, see https://github.com/visgl/deck.gl/issues/9086\n // @ts-expect-error not typed\n const groupInstance = mapboxGroup.implementation || mapboxGroup;\n layerGroups[groupId] = groupInstance;\n } else {\n const newGroup = new MapboxLayerGroup({\n id: groupId,\n slot: layer.props.slot,\n beforeId: layer.props.beforeId\n });\n layerGroups[groupId] = newGroup;\n map.addLayer(newGroup, layer.props.beforeId);\n }\n }\n\n // Step 3: check the order of layers\n // If beforeId move \"group\" layers to proper position in the mapbox layer order\n // @ts-ignore non-public map property\n const mapLayers: string[] = map.style._order;\n\n for (const [groupId, group] of Object.entries(layerGroups)) {\n const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;\n\n const expectedGroupIndex =\n beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);\n\n const currentGropupIndex = mapLayers.indexOf(groupId);\n if (currentGropupIndex !== expectedGroupIndex - 1) {\n const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? undefined : beforeId;\n map.moveLayer(groupId, moveBeforeId);\n }\n }\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {drawLayerGroup} from './deck-utils';\nimport type {Map, CustomLayerInterface} from './types';\nimport {assert, type Deck} from '@deck.gl/core';\n\ntype MapWithDeck = Map & {__deck: Deck};\n\nexport type MapboxLayerGroupProps = {\n id: string;\n renderingMode?: '2d' | '3d';\n /* Mapbox v3 Standard style */\n slot?: 'bottom' | 'middle' | 'top';\n beforeId?: string;\n};\n\nexport default class MapboxLayerGroup implements CustomLayerInterface {\n id: string;\n type: 'custom';\n renderingMode: '2d' | '3d';\n /* Mapbox v3 Standard style */\n slot?: 'bottom' | 'middle' | 'top';\n beforeId?: string;\n map: MapWithDeck | null;\n\n /* eslint-disable no-this-before-super */\n constructor(props: MapboxLayerGroupProps) {\n assert(props.id, 'id is required');\n\n this.id = props.id;\n this.type = 'custom';\n this.renderingMode = props.renderingMode || '3d';\n this.slot = props.slot;\n this.beforeId = props.beforeId;\n this.map = null;\n }\n\n /* Mapbox custom layer methods */\n\n onAdd(map: MapWithDeck, gl: WebGL2RenderingContext): void {\n this.map = map;\n }\n\n render(gl, renderParameters) {\n if (!this.map) return;\n\n drawLayerGroup(this.map.__deck, this.map, this, renderParameters);\n }\n}\n"],
|
|
5
|
-
"mappings": "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",
|
|
4
|
+
"sourcesContent": ["// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nexport {default as MapboxOverlay} from './mapbox-overlay';\n\nexport type {MapboxOverlayProps} from './mapbox-overlay';\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Deck, assert, log} from '@deck.gl/core';\nimport {\n getViewState,\n getDefaultView,\n getDeckInstance,\n removeDeckInstance,\n getDefaultParameters,\n getProjection,\n MAPBOX_VIEW_ID\n} from './deck-utils';\n\nimport type {Map, IControl, MapMouseEvent, ControlPosition} from './types';\nimport type {MjolnirGestureEvent, MjolnirPointerEvent} from 'mjolnir.js';\nimport type {DeckProps, LayersList} from '@deck.gl/core';\n\nimport {resolveLayerGroups} from './resolve-layer-groups';\n\nexport type MapboxOverlayProps = Omit<\n DeckProps,\n | 'width'\n | 'height'\n | 'gl'\n | 'parent'\n | 'canvas'\n | '_customRender'\n | 'viewState'\n | 'initialViewState'\n | 'controller'\n> & {\n /**\n * deck.gl layers are inserted into mapbox-gl's layer stack, and share the same WebGL2RenderingContext as the base map.\n */\n interleaved?: boolean;\n};\n\n/**\n * Implements Mapbox [IControl](https://docs.mapbox.com/mapbox-gl-js/api/markers/#icontrol) interface\n * Renders deck.gl layers over the base map and automatically synchronizes with the map's camera\n */\nexport default class MapboxOverlay implements IControl {\n private _props: MapboxOverlayProps;\n private _deck?: Deck<any>;\n private _map?: Map;\n private _container?: HTMLDivElement;\n private _interleaved: boolean;\n private _lastMouseDownPoint?: {x: number; y: number; clientX: number; clientY: number};\n\n constructor(props: MapboxOverlayProps) {\n const {interleaved = false} = props;\n this._interleaved = interleaved;\n this._props = this.filterProps(props);\n }\n\n /** Filter out props to pass to Deck **/\n filterProps(props: MapboxOverlayProps): MapboxOverlayProps {\n const {interleaved = false, useDevicePixels, ...deckProps} = props;\n if (!interleaved && useDevicePixels !== undefined) {\n // useDevicePixels cannot be used in interleaved mode\n (deckProps as MapboxOverlayProps).useDevicePixels = useDevicePixels;\n }\n return deckProps;\n }\n\n /** Update (partial) props of the underlying Deck instance. */\n setProps(props: MapboxOverlayProps): void {\n if (this._interleaved && props.layers) {\n this._resolveLayers(this._map, this._deck, this._props.layers, props.layers);\n }\n\n Object.assign(this._props, this.filterProps(props));\n\n if (this._deck && this._map) {\n this._deck.setProps({\n ...this._props,\n views: this._getViews(this._map),\n parameters: {\n ...getDefaultParameters(this._map, this._interleaved),\n ...this._props.parameters\n }\n });\n }\n }\n\n // The local Map type is for internal typecheck only. It does not necesarily satisefy mapbox/maplibre types at runtime.\n // Do not restrict the argument type here to avoid type conflict.\n /** Called when the control is added to a map */\n onAdd(map: unknown): HTMLDivElement {\n this._map = map as Map;\n return this._interleaved ? this._onAddInterleaved(map as Map) : this._onAddOverlaid(map as Map);\n }\n\n private _onAddOverlaid(map: Map): HTMLDivElement {\n /* global document */\n const container = document.createElement('div');\n Object.assign(container.style, {\n position: 'absolute',\n left: 0,\n top: 0,\n textAlign: 'initial',\n pointerEvents: 'none'\n });\n this._container = container;\n\n this._deck = new Deck<any>({\n ...this._props,\n parent: container,\n parameters: {...getDefaultParameters(map, false), ...this._props.parameters},\n views: this._getViews(map),\n viewState: getViewState(map)\n });\n\n map.on('resize', this._updateContainerSize);\n map.on('render', this._updateViewState);\n map.on('mousedown', this._handleMouseEvent);\n map.on('dragstart', this._handleMouseEvent);\n map.on('drag', this._handleMouseEvent);\n map.on('dragend', this._handleMouseEvent);\n map.on('mousemove', this._handleMouseEvent);\n map.on('mouseout', this._handleMouseEvent);\n map.on('click', this._handleMouseEvent);\n map.on('dblclick', this._handleMouseEvent);\n\n this._updateContainerSize();\n return container;\n }\n\n private _onAddInterleaved(map: Map): HTMLDivElement {\n // @ts-ignore non-public map property\n const gl: WebGL2RenderingContext = map.painter.context.gl;\n if (gl instanceof WebGLRenderingContext) {\n log.warn(\n 'Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility'\n )();\n }\n this._deck = getDeckInstance({\n map,\n deck: new Deck({\n ...this._props,\n views: this._getViews(map),\n gl,\n parameters: {...getDefaultParameters(map, true), ...this._props.parameters}\n })\n });\n\n map.on('styledata', this._handleStyleChange);\n this._resolveLayers(map, this._deck, [], this._props.layers);\n\n return document.createElement('div');\n }\n\n private _resolveLayers(\n map: Map | undefined,\n _deck: Deck | undefined,\n prevLayers: LayersList | undefined,\n newLayers: LayersList | undefined\n ): void {\n resolveLayerGroups(map, prevLayers, newLayers);\n }\n\n /** Called when the control is removed from a map */\n onRemove(): void {\n const map = this._map;\n\n if (map) {\n if (this._interleaved) {\n this._onRemoveInterleaved(map);\n } else {\n this._onRemoveOverlaid(map);\n }\n }\n\n this._deck = undefined;\n this._map = undefined;\n this._container = undefined;\n }\n\n private _onRemoveOverlaid(map: Map): void {\n map.off('resize', this._updateContainerSize);\n map.off('render', this._updateViewState);\n map.off('mousedown', this._handleMouseEvent);\n map.off('dragstart', this._handleMouseEvent);\n map.off('drag', this._handleMouseEvent);\n map.off('dragend', this._handleMouseEvent);\n map.off('mousemove', this._handleMouseEvent);\n map.off('mouseout', this._handleMouseEvent);\n map.off('click', this._handleMouseEvent);\n map.off('dblclick', this._handleMouseEvent);\n this._deck?.finalize();\n }\n\n private _onRemoveInterleaved(map: Map): void {\n map.off('styledata', this._handleStyleChange);\n this._resolveLayers(map, this._deck, this._props.layers, []);\n removeDeckInstance(map);\n }\n\n getDefaultPosition(): ControlPosition {\n return 'top-left';\n }\n\n /** Forwards the Deck.pickObject method */\n pickObject(params: Parameters<Deck['pickObject']>[0]): ReturnType<Deck['pickObject']> {\n assert(this._deck);\n return this._deck.pickObject(params);\n }\n\n /** Forwards the Deck.pickMultipleObjects method */\n pickMultipleObjects(\n params: Parameters<Deck['pickMultipleObjects']>[0]\n ): ReturnType<Deck['pickMultipleObjects']> {\n assert(this._deck);\n return this._deck.pickMultipleObjects(params);\n }\n\n /** Forwards the Deck.pickObjects method */\n pickObjects(params: Parameters<Deck['pickObjects']>[0]): ReturnType<Deck['pickObjects']> {\n assert(this._deck);\n return this._deck.pickObjects(params);\n }\n\n /** Remove from map and releases all resources */\n finalize() {\n if (this._map) {\n this._map.removeControl(this);\n }\n }\n\n /** If interleaved: true, returns base map's canvas, otherwise forwards the Deck.getCanvas method. */\n getCanvas(): HTMLCanvasElement | null {\n if (!this._map) {\n return null;\n }\n return this._interleaved ? this._map.getCanvas() : this._deck!.getCanvas();\n }\n\n private _handleStyleChange = () => {\n this._resolveLayers(this._map, this._deck, this._props.layers, this._props.layers);\n if (!this._map) return;\n\n // getProjection() returns undefined before style is loaded\n const projection = getProjection(this._map);\n if (projection) {\n // Update views to match new projection (MapView vs GlobeView)\n this._deck?.setProps({views: this._getViews(this._map)});\n }\n };\n\n private _updateContainerSize = () => {\n if (this._map && this._container) {\n const {clientWidth, clientHeight} = this._map.getContainer();\n Object.assign(this._container.style, {\n width: `${clientWidth}px`,\n height: `${clientHeight}px`\n });\n }\n };\n\n private _getViews(map: Map) {\n if (!this._props.views) {\n return getDefaultView(map);\n }\n // Check if custom views already include a 'mapbox' view\n const views = Array.isArray(this._props.views) ? this._props.views : [this._props.views];\n const hasMapboxView = views.some((v: any) => v.id === MAPBOX_VIEW_ID);\n if (hasMapboxView) {\n return this._props.views;\n }\n // Add default 'mapbox' view to custom views for consistency with interleaved mode\n return [getDefaultView(map), ...views];\n }\n\n private _updateViewState = () => {\n const deck = this._deck;\n const map = this._map;\n if (deck && map) {\n deck.setProps({\n views: this._getViews(map),\n viewState: getViewState(map)\n });\n // Redraw immediately if view state has changed\n if (deck.isInitialized) {\n deck.redraw();\n }\n }\n };\n\n // eslint-disable-next-line complexity\n private _handleMouseEvent = (event: MapMouseEvent) => {\n const deck = this._deck;\n if (!deck || !deck.isInitialized) {\n return;\n }\n\n const mockEvent: {\n type: string;\n deltaX?: number;\n deltaY?: number;\n offsetCenter: {x: number; y: number};\n srcEvent: MapMouseEvent;\n tapCount?: number;\n } = {\n type: event.type,\n offsetCenter: event.point,\n srcEvent: event\n };\n\n const lastDown = this._lastMouseDownPoint;\n if (!event.point && lastDown) {\n // drag* events do not contain a `point` field\n mockEvent.deltaX = event.originalEvent.clientX - lastDown.clientX;\n mockEvent.deltaY = event.originalEvent.clientY - lastDown.clientY;\n mockEvent.offsetCenter = {\n x: lastDown.x + mockEvent.deltaX,\n y: lastDown.y + mockEvent.deltaY\n };\n }\n\n switch (mockEvent.type) {\n case 'mousedown':\n deck._onPointerDown(mockEvent as unknown as MjolnirPointerEvent);\n this._lastMouseDownPoint = {\n ...event.point,\n clientX: event.originalEvent.clientX,\n clientY: event.originalEvent.clientY\n };\n break;\n\n case 'dragstart':\n mockEvent.type = 'panstart';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'drag':\n mockEvent.type = 'panmove';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'dragend':\n mockEvent.type = 'panend';\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'click':\n mockEvent.tapCount = 1;\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'dblclick':\n mockEvent.type = 'click';\n mockEvent.tapCount = 2;\n deck._onEvent(mockEvent as unknown as MjolnirGestureEvent);\n break;\n\n case 'mousemove':\n mockEvent.type = 'pointermove';\n deck._onPointerMove(mockEvent as unknown as MjolnirPointerEvent);\n break;\n\n case 'mouseout':\n mockEvent.type = 'pointerleave';\n deck._onPointerMove(mockEvent as unknown as MjolnirPointerEvent);\n break;\n\n default:\n return;\n }\n };\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Deck, MapView, _GlobeView as GlobeView, _flatten as flatten} from '@deck.gl/core';\nimport type {Viewport, MapViewState, Layer} from '@deck.gl/core';\nimport type {Parameters} from '@luma.gl/core';\nimport type MapboxLayerGroup from './mapbox-layer-group';\nimport type {LayerOverlayProps, Map} from './types';\nimport {getLayerGroupId} from './resolve-layer-groups';\n\nimport {lngLatToWorld, unitsPerMeter} from '@math.gl/web-mercator';\n\nexport const MAPBOX_VIEW_ID = 'mapbox';\n\ntype UserData = {\n currentViewport?: Viewport | null;\n};\n\n// Mercator constants\nconst TILE_SIZE = 512;\nconst DEGREES_TO_RADIANS = Math.PI / 180;\n\n// Create an interleaved deck instance.\nexport function getDeckInstance({\n map,\n deck\n}: {\n map: Map & {__deck?: Deck<any> | null};\n deck: Deck<any>;\n}): Deck<any> {\n // Only create one deck instance per context\n if (map.__deck) {\n return map.__deck;\n }\n\n // Only initialize certain props once per context\n const customRender = deck.props._customRender;\n const onLoad = deck.props.onLoad;\n\n const deckProps = {\n ...deck.props,\n _customRender: () => {\n map.triggerRepaint();\n // customRender may be subscribed by DeckGL React component to update child props\n // make sure it is still called\n // Hack - do not pass a redraw reason here to prevent the React component from clearing the context\n // Rerender will be triggered by MapboxLayerGroup's render()\n customRender?.('');\n }\n };\n deckProps.views ||= getDefaultView(map);\n\n // deck is using the WebGLContext created by mapbox.\n // The map and its attached luma canvas context own canvas sizing and DPR state here.\n // Deck only follows view state and avoids trying to size the shared canvas itself.\n Object.assign(deckProps, {\n width: null,\n height: null,\n touchAction: 'unset',\n viewState: getViewState(map)\n });\n if (deck.isInitialized) {\n watchMapMove(deck, map);\n } else {\n deckProps.onLoad = () => {\n onLoad?.();\n watchMapMove(deck, map);\n };\n }\n\n deck.setProps(deckProps);\n\n map.__deck = deck;\n map.on('render', () => {\n if (deck.isInitialized) afterRender(deck, map);\n });\n\n return deck;\n}\n\nfunction watchMapMove(deck: Deck, map: Map & {__deck?: Deck | null}) {\n const _handleMapMove = () => {\n if (deck.isInitialized) {\n // call view state methods\n onMapMove(deck, map);\n } else {\n // deregister itself when deck is finalized\n map.off('move', _handleMapMove);\n }\n };\n map.on('move', _handleMapMove);\n}\n\nexport function removeDeckInstance(map: Map & {__deck?: Deck | null}) {\n map.__deck?.finalize();\n map.__deck = null;\n}\n\nexport function getDefaultParameters(map: Map, interleaved: boolean): Parameters {\n const result: Parameters = interleaved\n ? {\n depthWriteEnabled: true,\n depthCompare: 'less-equal',\n depthBias: 0,\n blend: true,\n blendColorSrcFactor: 'src-alpha',\n blendColorDstFactor: 'one-minus-src-alpha',\n blendAlphaSrcFactor: 'one',\n blendAlphaDstFactor: 'one-minus-src-alpha',\n blendColorOperation: 'add',\n blendAlphaOperation: 'add'\n }\n : {};\n return result;\n}\n\nexport function drawLayerGroup(\n deck: Deck,\n map: Map,\n group: MapboxLayerGroup,\n renderParameters: any\n): void {\n if (!deck.isInitialized) {\n return;\n }\n\n let {currentViewport} = deck.userData as UserData;\n let clearStack: boolean = false;\n if (!currentViewport) {\n // This is the first layer drawn in this render cycle.\n // Generate viewport from the current map state.\n currentViewport = getViewport(deck, map, renderParameters);\n (deck.userData as UserData).currentViewport = currentViewport;\n clearStack = true;\n }\n\n if (!currentViewport) {\n return;\n }\n\n deck._drawLayers('mapbox-repaint', {\n viewports: [currentViewport],\n layerFilter: params => {\n if (deck.props.layerFilter && !deck.props.layerFilter(params)) {\n return false;\n }\n\n const layer = params.layer as Layer<LayerOverlayProps>;\n if (layer.props.beforeId === group.beforeId && layer.props.slot === group.slot) {\n return true;\n }\n return false;\n },\n clearStack,\n clearCanvas: false\n });\n}\n\nexport function getProjection(map: Map): 'mercator' | 'globe' {\n const projection = map.getProjection?.();\n const type =\n // maplibre projection spec\n projection?.type ||\n // mapbox projection spec\n projection?.name;\n if (type === 'globe') {\n return 'globe';\n }\n if (type && type !== 'mercator') {\n throw new Error('Unsupported projection');\n }\n return 'mercator';\n}\n\nexport function getDefaultView(map: Map): GlobeView | MapView {\n if (getProjection(map) === 'globe') {\n return new GlobeView({id: MAPBOX_VIEW_ID});\n }\n return new MapView({id: MAPBOX_VIEW_ID});\n}\n\nexport function getViewState(map: Map): MapViewState & {\n repeat: boolean;\n padding: {\n left: number;\n right: number;\n top: number;\n bottom: number;\n };\n} {\n const {lng, lat} = map.getCenter();\n\n const viewState: MapViewState & {\n repeat: boolean;\n padding: {\n left: number;\n right: number;\n top: number;\n bottom: number;\n };\n } = {\n // Longitude returned by getCenter can be outside of [-180, 180] when zooming near the anti meridian\n // https://github.com/visgl/deck.gl/issues/6894\n longitude: ((lng + 540) % 360) - 180,\n latitude: lat,\n zoom: map.getZoom(),\n bearing: map.getBearing(),\n pitch: map.getPitch(),\n padding: map.getPadding(),\n repeat: map.getRenderWorldCopies()\n };\n\n if (map.getTerrain?.()) {\n // When the base map has terrain, we need to target the camera at the terrain surface\n centerCameraOnTerrain(map, viewState);\n }\n\n return viewState;\n}\n\nfunction centerCameraOnTerrain(map: Map, viewState: MapViewState) {\n if (map.getFreeCameraOptions) {\n // mapbox-gl v2\n const {position} = map.getFreeCameraOptions();\n if (!position || position.z === undefined) {\n return;\n }\n\n // @ts-ignore transform is not typed\n const height = map.transform.height;\n const {longitude, latitude, pitch} = viewState;\n\n // Convert mapbox mercator coordinate to deck common space\n const cameraX = position.x * TILE_SIZE;\n const cameraY = (1 - position.y) * TILE_SIZE;\n const cameraZ = position.z * TILE_SIZE;\n\n // Mapbox manipulates zoom in terrain mode, see discussion here: https://github.com/mapbox/mapbox-gl-js/issues/12040\n const center = lngLatToWorld([longitude, latitude]);\n const dx = cameraX - center[0];\n const dy = cameraY - center[1];\n const cameraToCenterDistanceGround = Math.sqrt(dx * dx + dy * dy);\n\n const pitchRadians = pitch! * DEGREES_TO_RADIANS;\n const altitudePixels = 1.5 * height;\n const scale =\n pitchRadians < 0.001\n ? // Pitch angle too small to deduce the look at point, assume elevation is 0\n (altitudePixels * Math.cos(pitchRadians)) / cameraZ\n : (altitudePixels * Math.sin(pitchRadians)) / cameraToCenterDistanceGround;\n viewState.zoom = Math.log2(scale);\n\n const cameraZFromSurface = (altitudePixels * Math.cos(pitchRadians)) / scale;\n const surfaceElevation = cameraZ - cameraZFromSurface;\n viewState.position = [0, 0, surfaceElevation / unitsPerMeter(latitude)];\n }\n // @ts-ignore transform is not typed\n else if (typeof map.transform.elevation === 'number') {\n // maplibre-gl\n // @ts-ignore transform is not typed\n viewState.position = [0, 0, map.transform.elevation];\n }\n}\n\n// Since maplibre-gl@5\n// https://github.com/maplibre/maplibre-gl-js/blob/main/src/style/style_layer/custom_style_layer.ts\ntype MaplibreRenderParameters = {\n farZ: number;\n nearZ: number;\n fov: number;\n modelViewProjectionMatrix: number[];\n projectionMatrix: number[];\n};\n\nfunction getViewport(deck: Deck, map: Map, renderParameters?: unknown): Viewport | null {\n const viewState = getViewState(map);\n // View is always MapView or GlobeView in this context\n const view = (deck.getView(MAPBOX_VIEW_ID) || getDefaultView(map)) as MapView | GlobeView;\n\n if (renderParameters) {\n // Called from MapboxLayerGroup.render\n // Magic number, matches mapbox-gl@>=1.3.0's projection matrix\n view.props.nearZMultiplier = 0.2;\n }\n\n // Get the base map near/far plane\n // renderParameters is maplibre API but not mapbox\n // Transform is not an official API, properties could be undefined for older versions\n const nearZ = (renderParameters as MaplibreRenderParameters)?.nearZ ?? map.transform._nearZ;\n const farZ = (renderParameters as MaplibreRenderParameters)?.farZ ?? map.transform._farZ;\n if (Number.isFinite(nearZ)) {\n viewState.nearZ = nearZ / map.transform.height;\n viewState.farZ = farZ / map.transform.height;\n }\n // Otherwise fallback to default calculation using nearZMultiplier/farZMultiplier\n\n return view.makeViewport({\n width: deck.width,\n height: deck.height,\n viewState\n });\n}\n\nfunction afterRender(deck: Deck, map: Map): void {\n // Draw non-Mapbox layers (layers that don't have a corresponding MapboxLayerGroup on the map)\n const deckLayers = flatten(deck.props.layers, Boolean) as Layer<LayerOverlayProps>[];\n const hasNonMapboxLayers = deckLayers.some(\n layer => layer && !map.getLayer(getLayerGroupId(layer))\n );\n let viewports = deck.getViewports();\n const mapboxViewportIdx = viewports.findIndex(vp => vp.id === MAPBOX_VIEW_ID);\n const hasNonMapboxViews = viewports.length > 1 || mapboxViewportIdx < 0;\n\n if (hasNonMapboxLayers || hasNonMapboxViews) {\n if (mapboxViewportIdx >= 0) {\n viewports = viewports.slice();\n const mapboxViewport = getViewport(deck, map);\n if (mapboxViewport) {\n viewports[mapboxViewportIdx] = mapboxViewport;\n } else {\n viewports.splice(mapboxViewportIdx, 1);\n }\n }\n\n deck._drawLayers('mapbox-repaint', {\n viewports,\n layerFilter: params =>\n (!deck.props.layerFilter || deck.props.layerFilter(params)) &&\n (params.viewport.id !== MAPBOX_VIEW_ID ||\n !map.getLayer(getLayerGroupId(params.layer as Layer<LayerOverlayProps>))),\n clearCanvas: false\n });\n } else {\n // Even when there are no non-Mapbox layers to draw, fire lifecycle callbacks\n // so that consumers can still track view state changes via onAfterRender\n const device = (deck as any).device;\n const gl = device?.gl;\n deck.props.onBeforeRender?.({device, gl});\n deck.props.onAfterRender?.({device, gl});\n }\n\n // End of render cycle, clear generated viewport\n (deck.userData as UserData).currentViewport = null;\n}\n\nfunction onMapMove(deck: Deck, map: Map): void {\n deck.setProps({\n viewState: getViewState(map)\n });\n // Camera changed, will trigger a map repaint right after this\n // Clear any change flag triggered by setting viewState so that deck does not request\n // a second repaint\n deck.needsRedraw({clearRedrawFlags: true});\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {_flatten as flatten} from '@deck.gl/core';\n\nimport type {Layer, LayersList} from '@deck.gl/core';\nimport type {Map, LayerOverlayProps} from './types';\nimport MapboxLayerGroup from './mapbox-layer-group';\n\nconst UNDEFINED_BEFORE_ID = '__UNDEFINED__';\n\nexport function getLayerGroupId(layer: Layer<LayerOverlayProps>): string {\n if (layer.props.beforeId) {\n return `deck-layer-group-before:${layer.props.beforeId}`;\n } else if (layer.props.slot) {\n return `deck-layer-group-slot:${layer.props.slot}`;\n }\n return 'deck-layer-group-last';\n}\n\n/** Group Deck layers into buckets (by beforeId or slot) and insert them\n * into the mapbox Map according to the user-defined order\n **/\n// eslint-disable-next-line complexity, max-statements\nexport function resolveLayerGroups(map?: Map, oldLayers?: LayersList, newLayers?: LayersList) {\n // Wait until map style is loaded\n // @ts-ignore non-public map property\n if (!map || !map.style || !map.style._loaded) {\n return;\n }\n\n const layers = flatten(newLayers, Boolean) as Layer<LayerOverlayProps>[];\n\n if (oldLayers !== newLayers) {\n // Step 1: remove \"group\" layers that no longer exist\n const prevLayers = flatten(oldLayers, Boolean) as Layer<LayerOverlayProps>[];\n const prevLayerGroupIds = new Set<string>(prevLayers.map(l => getLayerGroupId(l)));\n const newLayerGroupIds = new Set<string>(layers.map(l => getLayerGroupId(l)));\n\n for (const groupId of prevLayerGroupIds) {\n if (!newLayerGroupIds.has(groupId)) {\n if (map.getLayer(groupId)) {\n map.removeLayer(groupId);\n }\n }\n }\n }\n\n // Step 2: add missing \"group\" layers\n const layerGroups: Record<string, MapboxLayerGroup> = {};\n for (const layer of layers) {\n const groupId = getLayerGroupId(layer);\n const mapboxGroup = map.getLayer(groupId) as MapboxLayerGroup;\n if (mapboxGroup) {\n // Mapbox's map.getLayer() had a breaking change in v3.6.0, see https://github.com/visgl/deck.gl/issues/9086\n // @ts-expect-error not typed\n const groupInstance = mapboxGroup.implementation || mapboxGroup;\n layerGroups[groupId] = groupInstance;\n } else {\n const newGroup = new MapboxLayerGroup({\n id: groupId,\n slot: layer.props.slot,\n beforeId: layer.props.beforeId\n });\n layerGroups[groupId] = newGroup;\n map.addLayer(newGroup, layer.props.beforeId);\n }\n }\n\n // Step 3: check the order of layers\n // If beforeId move \"group\" layers to proper position in the mapbox layer order\n // @ts-ignore non-public map property\n const mapLayers: string[] = map.style._order;\n\n for (const [groupId, group] of Object.entries(layerGroups)) {\n const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;\n\n const expectedGroupIndex =\n beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);\n\n if (expectedGroupIndex === -1) {\n continue;\n }\n\n const currentGropupIndex = mapLayers.indexOf(groupId);\n if (currentGropupIndex !== expectedGroupIndex - 1) {\n const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? undefined : beforeId;\n map.moveLayer(groupId, moveBeforeId);\n }\n }\n}\n", "// deck.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {drawLayerGroup} from './deck-utils';\nimport type {Map, CustomLayerInterface} from './types';\nimport {assert, type Deck} from '@deck.gl/core';\n\ntype MapWithDeck = Map & {__deck: Deck};\n\nexport type MapboxLayerGroupProps = {\n id: string;\n renderingMode?: '2d' | '3d';\n /* Mapbox v3 Standard style */\n slot?: 'bottom' | 'middle' | 'top';\n beforeId?: string;\n};\n\nexport default class MapboxLayerGroup implements CustomLayerInterface {\n id: string;\n type: 'custom';\n renderingMode: '2d' | '3d';\n /* Mapbox v3 Standard style */\n slot?: 'bottom' | 'middle' | 'top';\n beforeId?: string;\n map: MapWithDeck | null;\n\n /* eslint-disable no-this-before-super */\n constructor(props: MapboxLayerGroupProps) {\n assert(props.id, 'id is required');\n\n this.id = props.id;\n this.type = 'custom';\n this.renderingMode = props.renderingMode || '3d';\n this.slot = props.slot;\n this.beforeId = props.beforeId;\n this.map = null;\n }\n\n /* Mapbox custom layer methods */\n\n onAdd(map: MapWithDeck, gl: WebGL2RenderingContext): void {\n this.map = map;\n }\n\n render(gl, renderParameters) {\n if (!this.map) return;\n\n drawLayerGroup(this.map.__deck, this.map, this, renderParameters);\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["import_core", "import_core", "import_core", "flatten", "GlobeView", "flatten"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-layer-groups.d.ts","sourceRoot":"","sources":["../src/resolve-layer-groups.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAC,GAAG,EAAE,iBAAiB,EAAC,mBAAgB;AAKpD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAOvE;AAED;;IAEI;AAEJ,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"resolve-layer-groups.d.ts","sourceRoot":"","sources":["../src/resolve-layer-groups.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAC,GAAG,EAAE,iBAAiB,EAAC,mBAAgB;AAKpD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAOvE;AAED;;IAEI;AAEJ,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,UAAU,QAkE3F"}
|
|
@@ -65,6 +65,9 @@ export function resolveLayerGroups(map, oldLayers, newLayers) {
|
|
|
65
65
|
for (const [groupId, group] of Object.entries(layerGroups)) {
|
|
66
66
|
const beforeId = group.beforeId || UNDEFINED_BEFORE_ID;
|
|
67
67
|
const expectedGroupIndex = beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
|
|
68
|
+
if (expectedGroupIndex === -1) {
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
68
71
|
const currentGropupIndex = mapLayers.indexOf(groupId);
|
|
69
72
|
if (currentGropupIndex !== expectedGroupIndex - 1) {
|
|
70
73
|
const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? undefined : beforeId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-layer-groups.js","sourceRoot":"","sources":["../src/resolve-layer-groups.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolve-layer-groups.js","sourceRoot":"","sources":["../src/resolve-layer-groups.ts"],"names":[],"mappings":"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"}
|
package/dist.min.js
CHANGED
|
@@ -4,6 +4,6 @@
|
|
|
4
4
|
else if (typeof define === 'function' && define.amd) define([], factory);
|
|
5
5
|
else if (typeof exports === 'object') exports['deck'] = factory();
|
|
6
6
|
else root['deck'] = factory();})(globalThis, function () {
|
|
7
|
-
"use strict";var __exports__=(()=>{var re=Object.create;var I=Object.defineProperty;var ne=Object.getOwnPropertyDescriptor;var ie=Object.getOwnPropertyNames;var se=Object.getPrototypeOf,ae=Object.prototype.hasOwnProperty;var ce=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),le=(t,e)=>{for(var o in e)I(t,o,{get:e[o],enumerable:!0})},k=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of ie(e))!ae.call(t,n)&&n!==o&&I(t,n,{get:()=>e[n],enumerable:!(r=ne(e,n))||r.enumerable});return t},d=(t,e,o)=>(k(t,e,"default"),o&&k(o,e,"default")),g=(t,e,o)=>(o=t!=null?re(se(t)):{},k(e||!t||!t.__esModule?I(o,"default",{value:t,enumerable:!0}):o,t)),pe=t=>k(I({},"__esModule",{value:!0}),t);var h=ce((Oe,U)=>{U.exports=globalThis.deck});var P={};le(P,{MapboxOverlay:()=>L});var p={},X=g(h(),1);d(p,g(h(),1));if(!X.Layer)throw new Error("@deck.gl/core is not found");d(P,p);var u=g(h(),1);var _=g(h(),1);var V=g(h(),1);var B=g(h(),1),b=class{constructor(e){(0,B.assert)(e.id,"id is required"),this.id=e.id,this.type="custom",this.renderingMode=e.renderingMode||"3d",this.slot=e.slot,this.beforeId=e.beforeId,this.map=null}onAdd(e,o){this.map=e}render(e,o){this.map&&W(this.map.__deck,this.map,this,o)}};var C="__UNDEFINED__";function M(t){return t.props.beforeId?`deck-layer-group-before:${t.props.beforeId}`:t.props.slot?`deck-layer-group-slot:${t.props.slot}`:"deck-layer-group-last"}function Y(t,e,o){if(!t||!t.style||!t.style._loaded)return;let r=(0,V._flatten)(o,Boolean);if(e!==o){let s=(0,V._flatten)(e,Boolean),i=new Set(s.map(c=>M(c))),l=new Set(r.map(c=>M(c)));for(let c of i)l.has(c)||t.getLayer(c)&&t.removeLayer(c)}let n={};for(let s of r){let i=M(s),l=t.getLayer(i);if(l){let c=l.implementation||l;n[i]=c}else{let c=new b({id:i,slot:s.props.slot,beforeId:s.props.beforeId});n[i]=c,t.addLayer(c,s.props.beforeId)}}let a=t.style._order;for(let[s,i]of Object.entries(n)){let l=i.beforeId||C,c=l===C?a.length:a.indexOf(l);if(a.indexOf(s)!==c-1){let D=l===C?void 0:l;t.moveLayer(s,D)}}}function T(t,e){if(!t)throw new Error(e||"@math.gl/web-mercator: assertion failed.")}var f=Math.PI,fe=f/4,F=f/180,Ue=180/f,R=512,me=4003e4;function v(t){let[e,o]=t;T(Number.isFinite(e)),T(Number.isFinite(o)&&o>=-90&&o<=90,"invalid latitude");let r=e*F,n=o*F,a=R*(r+f)/(2*f),s=R*(f+Math.log(Math.tan(fe+n*.5)))/(2*f);return[a,s]}function z(t){let e=Math.cos(t*F);return R/me/e}var Je=Math.PI/180;var m="mapbox",A=512,ke=Math.PI/180;function J({map:t,deck:e}){if(t.__deck)return t.__deck;let o=e.props._customRender,r=e.props.onLoad,n={...e.props,_customRender:()=>{t.triggerRepaint(),o?.("")}};return n.views||=w(t),Object.assign(n,{width:null,height:null,touchAction:"unset",viewState:y(t)}),e.isInitialized?$(e,t):n.onLoad=()=>{r?.(),$(e,t)},e.setProps(n),t.__deck=e,t.on("render",()=>{e.isInitialized&&Te(e,t)}),e}function $(t,e){let o=()=>{t.isInitialized?je(t,e):e.off("move",o)};e.on("move",o)}function K(t){t.__deck?.finalize(),t.__deck=null}function j(t,e){return e?{depthWriteEnabled:!0,depthCompare:"less-equal",depthBias:0,blend:!0,blendColorSrcFactor:"src-alpha",blendColorDstFactor:"one-minus-src-alpha",blendAlphaSrcFactor:"one",blendAlphaDstFactor:"one-minus-src-alpha",blendColorOperation:"add",blendAlphaOperation:"add"}:{}}function W(t,e,o,r){if(!t.isInitialized)return;let{currentViewport:n}=t.userData,a=!1;n||(n=Q(t,e,r),t.userData.currentViewport=n,a=!0),n&&t._drawLayers("mapbox-repaint",{viewports:[n],layerFilter:s=>{if(t.props.layerFilter&&!t.props.layerFilter(s))return!1;let i=s.layer;return i.props.beforeId===o.beforeId&&i.props.slot===o.slot},clearStack:a,clearCanvas:!1})}function G(t){let e=t.getProjection?.(),o=e?.type||e?.name;if(o==="globe")return"globe";if(o&&o!=="mercator")throw new Error("Unsupported projection");return"mercator"}function w(t){return G(t)==="globe"?new _._GlobeView({id:m}):new _.MapView({id:m})}function y(t){let{lng:e,lat:o}=t.getCenter(),r={longitude:(e+540)%360-180,latitude:o,zoom:t.getZoom(),bearing:t.getBearing(),pitch:t.getPitch(),padding:t.getPadding(),repeat:t.getRenderWorldCopies()};return t.getTerrain?.()&&Ie(t,r),r}function Ie(t,e){if(t.getFreeCameraOptions){let{position:o}=t.getFreeCameraOptions();if(!o||o.z===void 0)return;let r=t.transform.height,{longitude:n,latitude:a,pitch:s}=e,i=o.x*A,l=(1-o.y)*A,c=o.z*A,S=v([n,a]),D=i-S[0],Z=l-S[1],ee=Math.sqrt(D*D+Z*Z),E=s*ke,O=1.5*r,N=E<.001?O*Math.cos(E)/c:O*Math.sin(E)/ee;e.zoom=Math.log2(N);let te=O*Math.cos(E)/N,oe=c-te;e.position=[0,0,oe/z(a)]}else typeof t.transform.elevation=="number"&&(e.position=[0,0,t.transform.elevation])}function Q(t,e,o){let r=y(e),n=t.getView(m)||w(e);o&&(n.props.nearZMultiplier=.2);let a=o?.nearZ??e.transform._nearZ,s=o?.farZ??e.transform._farZ;return Number.isFinite(a)&&(r.nearZ=a/e.transform.height,r.farZ=s/e.transform.height),n.makeViewport({width:t.width,height:t.height,viewState:r})}function Te(t,e){let r=(0,_._flatten)(t.props.layers,Boolean).some(i=>i&&!e.getLayer(M(i))),n=t.getViewports(),a=n.findIndex(i=>i.id===m),s=n.length>1||a<0;if(r||s){if(a>=0){n=n.slice();let i=Q(t,e);i?n[a]=i:n.splice(a,1)}t._drawLayers("mapbox-repaint",{viewports:n,layerFilter:i=>(!t.props.layerFilter||t.props.layerFilter(i))&&(i.viewport.id!==m||!e.getLayer(M(i.layer))),clearCanvas:!1})}else{let i=t.device,l=i?.gl;t.props.onBeforeRender?.({device:i,gl:l}),t.props.onAfterRender?.({device:i,gl:l})}t.userData.currentViewport=null}function je(t,e){t.setProps({viewState:y(e)}),t.needsRedraw({clearRedrawFlags:!0})}var L=class{constructor(e){this._handleStyleChange=()=>{if(this._resolveLayers(this._map,this._deck,this._props.layers,this._props.layers),!this._map)return;G(this._map)&&this._deck?.setProps({views:this._getViews(this._map)})};this._updateContainerSize=()=>{if(this._map&&this._container){let{clientWidth:e,clientHeight:o}=this._map.getContainer();Object.assign(this._container.style,{width:`${e}px`,height:`${o}px`})}};this._updateViewState=()=>{let e=this._deck,o=this._map;e&&o&&(e.setProps({views:this._getViews(o),viewState:y(o)}),e.isInitialized&&e.redraw())};this._handleMouseEvent=e=>{let o=this._deck;if(!o||!o.isInitialized)return;let r={type:e.type,offsetCenter:e.point,srcEvent:e},n=this._lastMouseDownPoint;switch(!e.point&&n&&(r.deltaX=e.originalEvent.clientX-n.clientX,r.deltaY=e.originalEvent.clientY-n.clientY,r.offsetCenter={x:n.x+r.deltaX,y:n.y+r.deltaY}),r.type){case"mousedown":o._onPointerDown(r),this._lastMouseDownPoint={...e.point,clientX:e.originalEvent.clientX,clientY:e.originalEvent.clientY};break;case"dragstart":r.type="panstart",o._onEvent(r);break;case"drag":r.type="panmove",o._onEvent(r);break;case"dragend":r.type="panend",o._onEvent(r);break;case"click":r.tapCount=1,o._onEvent(r);break;case"dblclick":r.type="click",r.tapCount=2,o._onEvent(r);break;case"mousemove":r.type="pointermove",o._onPointerMove(r);break;case"mouseout":r.type="pointerleave",o._onPointerMove(r);break;default:return}};let{interleaved:o=!1}=e;this._interleaved=o,this._props=this.filterProps(e)}filterProps(e){let{interleaved:o=!1,useDevicePixels:r,...n}=e;return!o&&r!==void 0&&(n.useDevicePixels=r),n}setProps(e){this._interleaved&&e.layers&&this._resolveLayers(this._map,this._deck,this._props.layers,e.layers),Object.assign(this._props,this.filterProps(e)),this._deck&&this._map&&this._deck.setProps({...this._props,views:this._getViews(this._map),parameters:{...j(this._map,this._interleaved),...this._props.parameters}})}onAdd(e){return this._map=e,this._interleaved?this._onAddInterleaved(e):this._onAddOverlaid(e)}_onAddOverlaid(e){let o=document.createElement("div");return Object.assign(o.style,{position:"absolute",left:0,top:0,textAlign:"initial",pointerEvents:"none"}),this._container=o,this._deck=new u.Deck({...this._props,parent:o,parameters:{...j(e,!1),...this._props.parameters},views:this._getViews(e),viewState:y(e)}),e.on("resize",this._updateContainerSize),e.on("render",this._updateViewState),e.on("mousedown",this._handleMouseEvent),e.on("dragstart",this._handleMouseEvent),e.on("drag",this._handleMouseEvent),e.on("dragend",this._handleMouseEvent),e.on("mousemove",this._handleMouseEvent),e.on("mouseout",this._handleMouseEvent),e.on("click",this._handleMouseEvent),e.on("dblclick",this._handleMouseEvent),this._updateContainerSize(),o}_onAddInterleaved(e){let o=e.painter.context.gl;return o instanceof WebGLRenderingContext&&u.log.warn("Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility")(),this._deck=J({map:e,deck:new u.Deck({...this._props,views:this._getViews(e),gl:o,parameters:{...j(e,!0),...this._props.parameters}})}),e.on("styledata",this._handleStyleChange),this._resolveLayers(e,this._deck,[],this._props.layers),document.createElement("div")}_resolveLayers(e,o,r,n){Y(e,r,n)}onRemove(){let e=this._map;e&&(this._interleaved?this._onRemoveInterleaved(e):this._onRemoveOverlaid(e)),this._deck=void 0,this._map=void 0,this._container=void 0}_onRemoveOverlaid(e){e.off("resize",this._updateContainerSize),e.off("render",this._updateViewState),e.off("mousedown",this._handleMouseEvent),e.off("dragstart",this._handleMouseEvent),e.off("drag",this._handleMouseEvent),e.off("dragend",this._handleMouseEvent),e.off("mousemove",this._handleMouseEvent),e.off("mouseout",this._handleMouseEvent),e.off("click",this._handleMouseEvent),e.off("dblclick",this._handleMouseEvent),this._deck?.finalize()}_onRemoveInterleaved(e){e.off("styledata",this._handleStyleChange),this._resolveLayers(e,this._deck,this._props.layers,[]),K(e)}getDefaultPosition(){return"top-left"}pickObject(e){return(0,u.assert)(this._deck),this._deck.pickObject(e)}pickMultipleObjects(e){return(0,u.assert)(this._deck),this._deck.pickMultipleObjects(e)}pickObjects(e){return(0,u.assert)(this._deck),this._deck.pickObjects(e)}finalize(){this._map&&this._map.removeControl(this)}getCanvas(){return this._map?this._interleaved?this._map.getCanvas():this._deck.getCanvas():null}_getViews(e){if(!this._props.views)return w(e);let o=Array.isArray(this._props.views)?this._props.views:[this._props.views];return o.some(n=>n.id===m)?this._props.views:[w(e),...o]}};return pe(P);})();
|
|
7
|
+
"use strict";var __exports__=(()=>{var re=Object.create;var I=Object.defineProperty;var ne=Object.getOwnPropertyDescriptor;var ie=Object.getOwnPropertyNames;var se=Object.getPrototypeOf,ae=Object.prototype.hasOwnProperty;var ce=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports),le=(t,e)=>{for(var o in e)I(t,o,{get:e[o],enumerable:!0})},k=(t,e,o,r)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of ie(e))!ae.call(t,n)&&n!==o&&I(t,n,{get:()=>e[n],enumerable:!(r=ne(e,n))||r.enumerable});return t},d=(t,e,o)=>(k(t,e,"default"),o&&k(o,e,"default")),g=(t,e,o)=>(o=t!=null?re(se(t)):{},k(e||!t||!t.__esModule?I(o,"default",{value:t,enumerable:!0}):o,t)),pe=t=>k(I({},"__esModule",{value:!0}),t);var h=ce((Oe,U)=>{U.exports=globalThis.deck});var P={};le(P,{MapboxOverlay:()=>L});var p={},X=g(h(),1);d(p,g(h(),1));if(!X.Layer)throw new Error("@deck.gl/core is not found");d(P,p);var u=g(h(),1);var _=g(h(),1);var V=g(h(),1);var B=g(h(),1),b=class{constructor(e){(0,B.assert)(e.id,"id is required"),this.id=e.id,this.type="custom",this.renderingMode=e.renderingMode||"3d",this.slot=e.slot,this.beforeId=e.beforeId,this.map=null}onAdd(e,o){this.map=e}render(e,o){this.map&&W(this.map.__deck,this.map,this,o)}};var C="__UNDEFINED__";function M(t){return t.props.beforeId?`deck-layer-group-before:${t.props.beforeId}`:t.props.slot?`deck-layer-group-slot:${t.props.slot}`:"deck-layer-group-last"}function Y(t,e,o){if(!t||!t.style||!t.style._loaded)return;let r=(0,V._flatten)(o,Boolean);if(e!==o){let s=(0,V._flatten)(e,Boolean),i=new Set(s.map(c=>M(c))),l=new Set(r.map(c=>M(c)));for(let c of i)l.has(c)||t.getLayer(c)&&t.removeLayer(c)}let n={};for(let s of r){let i=M(s),l=t.getLayer(i);if(l){let c=l.implementation||l;n[i]=c}else{let c=new b({id:i,slot:s.props.slot,beforeId:s.props.beforeId});n[i]=c,t.addLayer(c,s.props.beforeId)}}let a=t.style._order;for(let[s,i]of Object.entries(n)){let l=i.beforeId||C,c=l===C?a.length:a.indexOf(l);if(c===-1)continue;if(a.indexOf(s)!==c-1){let D=l===C?void 0:l;t.moveLayer(s,D)}}}function T(t,e){if(!t)throw new Error(e||"@math.gl/web-mercator: assertion failed.")}var f=Math.PI,fe=f/4,F=f/180,Ue=180/f,R=512,me=4003e4;function v(t){let[e,o]=t;T(Number.isFinite(e)),T(Number.isFinite(o)&&o>=-90&&o<=90,"invalid latitude");let r=e*F,n=o*F,a=R*(r+f)/(2*f),s=R*(f+Math.log(Math.tan(fe+n*.5)))/(2*f);return[a,s]}function z(t){let e=Math.cos(t*F);return R/me/e}var Je=Math.PI/180;var m="mapbox",A=512,ke=Math.PI/180;function J({map:t,deck:e}){if(t.__deck)return t.__deck;let o=e.props._customRender,r=e.props.onLoad,n={...e.props,_customRender:()=>{t.triggerRepaint(),o?.("")}};return n.views||=w(t),Object.assign(n,{width:null,height:null,touchAction:"unset",viewState:y(t)}),e.isInitialized?$(e,t):n.onLoad=()=>{r?.(),$(e,t)},e.setProps(n),t.__deck=e,t.on("render",()=>{e.isInitialized&&Te(e,t)}),e}function $(t,e){let o=()=>{t.isInitialized?je(t,e):e.off("move",o)};e.on("move",o)}function K(t){t.__deck?.finalize(),t.__deck=null}function j(t,e){return e?{depthWriteEnabled:!0,depthCompare:"less-equal",depthBias:0,blend:!0,blendColorSrcFactor:"src-alpha",blendColorDstFactor:"one-minus-src-alpha",blendAlphaSrcFactor:"one",blendAlphaDstFactor:"one-minus-src-alpha",blendColorOperation:"add",blendAlphaOperation:"add"}:{}}function W(t,e,o,r){if(!t.isInitialized)return;let{currentViewport:n}=t.userData,a=!1;n||(n=Q(t,e,r),t.userData.currentViewport=n,a=!0),n&&t._drawLayers("mapbox-repaint",{viewports:[n],layerFilter:s=>{if(t.props.layerFilter&&!t.props.layerFilter(s))return!1;let i=s.layer;return i.props.beforeId===o.beforeId&&i.props.slot===o.slot},clearStack:a,clearCanvas:!1})}function G(t){let e=t.getProjection?.(),o=e?.type||e?.name;if(o==="globe")return"globe";if(o&&o!=="mercator")throw new Error("Unsupported projection");return"mercator"}function w(t){return G(t)==="globe"?new _._GlobeView({id:m}):new _.MapView({id:m})}function y(t){let{lng:e,lat:o}=t.getCenter(),r={longitude:(e+540)%360-180,latitude:o,zoom:t.getZoom(),bearing:t.getBearing(),pitch:t.getPitch(),padding:t.getPadding(),repeat:t.getRenderWorldCopies()};return t.getTerrain?.()&&Ie(t,r),r}function Ie(t,e){if(t.getFreeCameraOptions){let{position:o}=t.getFreeCameraOptions();if(!o||o.z===void 0)return;let r=t.transform.height,{longitude:n,latitude:a,pitch:s}=e,i=o.x*A,l=(1-o.y)*A,c=o.z*A,S=v([n,a]),D=i-S[0],Z=l-S[1],ee=Math.sqrt(D*D+Z*Z),E=s*ke,O=1.5*r,N=E<.001?O*Math.cos(E)/c:O*Math.sin(E)/ee;e.zoom=Math.log2(N);let te=O*Math.cos(E)/N,oe=c-te;e.position=[0,0,oe/z(a)]}else typeof t.transform.elevation=="number"&&(e.position=[0,0,t.transform.elevation])}function Q(t,e,o){let r=y(e),n=t.getView(m)||w(e);o&&(n.props.nearZMultiplier=.2);let a=o?.nearZ??e.transform._nearZ,s=o?.farZ??e.transform._farZ;return Number.isFinite(a)&&(r.nearZ=a/e.transform.height,r.farZ=s/e.transform.height),n.makeViewport({width:t.width,height:t.height,viewState:r})}function Te(t,e){let r=(0,_._flatten)(t.props.layers,Boolean).some(i=>i&&!e.getLayer(M(i))),n=t.getViewports(),a=n.findIndex(i=>i.id===m),s=n.length>1||a<0;if(r||s){if(a>=0){n=n.slice();let i=Q(t,e);i?n[a]=i:n.splice(a,1)}t._drawLayers("mapbox-repaint",{viewports:n,layerFilter:i=>(!t.props.layerFilter||t.props.layerFilter(i))&&(i.viewport.id!==m||!e.getLayer(M(i.layer))),clearCanvas:!1})}else{let i=t.device,l=i?.gl;t.props.onBeforeRender?.({device:i,gl:l}),t.props.onAfterRender?.({device:i,gl:l})}t.userData.currentViewport=null}function je(t,e){t.setProps({viewState:y(e)}),t.needsRedraw({clearRedrawFlags:!0})}var L=class{constructor(e){this._handleStyleChange=()=>{if(this._resolveLayers(this._map,this._deck,this._props.layers,this._props.layers),!this._map)return;G(this._map)&&this._deck?.setProps({views:this._getViews(this._map)})};this._updateContainerSize=()=>{if(this._map&&this._container){let{clientWidth:e,clientHeight:o}=this._map.getContainer();Object.assign(this._container.style,{width:`${e}px`,height:`${o}px`})}};this._updateViewState=()=>{let e=this._deck,o=this._map;e&&o&&(e.setProps({views:this._getViews(o),viewState:y(o)}),e.isInitialized&&e.redraw())};this._handleMouseEvent=e=>{let o=this._deck;if(!o||!o.isInitialized)return;let r={type:e.type,offsetCenter:e.point,srcEvent:e},n=this._lastMouseDownPoint;switch(!e.point&&n&&(r.deltaX=e.originalEvent.clientX-n.clientX,r.deltaY=e.originalEvent.clientY-n.clientY,r.offsetCenter={x:n.x+r.deltaX,y:n.y+r.deltaY}),r.type){case"mousedown":o._onPointerDown(r),this._lastMouseDownPoint={...e.point,clientX:e.originalEvent.clientX,clientY:e.originalEvent.clientY};break;case"dragstart":r.type="panstart",o._onEvent(r);break;case"drag":r.type="panmove",o._onEvent(r);break;case"dragend":r.type="panend",o._onEvent(r);break;case"click":r.tapCount=1,o._onEvent(r);break;case"dblclick":r.type="click",r.tapCount=2,o._onEvent(r);break;case"mousemove":r.type="pointermove",o._onPointerMove(r);break;case"mouseout":r.type="pointerleave",o._onPointerMove(r);break;default:return}};let{interleaved:o=!1}=e;this._interleaved=o,this._props=this.filterProps(e)}filterProps(e){let{interleaved:o=!1,useDevicePixels:r,...n}=e;return!o&&r!==void 0&&(n.useDevicePixels=r),n}setProps(e){this._interleaved&&e.layers&&this._resolveLayers(this._map,this._deck,this._props.layers,e.layers),Object.assign(this._props,this.filterProps(e)),this._deck&&this._map&&this._deck.setProps({...this._props,views:this._getViews(this._map),parameters:{...j(this._map,this._interleaved),...this._props.parameters}})}onAdd(e){return this._map=e,this._interleaved?this._onAddInterleaved(e):this._onAddOverlaid(e)}_onAddOverlaid(e){let o=document.createElement("div");return Object.assign(o.style,{position:"absolute",left:0,top:0,textAlign:"initial",pointerEvents:"none"}),this._container=o,this._deck=new u.Deck({...this._props,parent:o,parameters:{...j(e,!1),...this._props.parameters},views:this._getViews(e),viewState:y(e)}),e.on("resize",this._updateContainerSize),e.on("render",this._updateViewState),e.on("mousedown",this._handleMouseEvent),e.on("dragstart",this._handleMouseEvent),e.on("drag",this._handleMouseEvent),e.on("dragend",this._handleMouseEvent),e.on("mousemove",this._handleMouseEvent),e.on("mouseout",this._handleMouseEvent),e.on("click",this._handleMouseEvent),e.on("dblclick",this._handleMouseEvent),this._updateContainerSize(),o}_onAddInterleaved(e){let o=e.painter.context.gl;return o instanceof WebGLRenderingContext&&u.log.warn("Incompatible basemap library. See: https://deck.gl/docs/api-reference/mapbox/overview#compatibility")(),this._deck=J({map:e,deck:new u.Deck({...this._props,views:this._getViews(e),gl:o,parameters:{...j(e,!0),...this._props.parameters}})}),e.on("styledata",this._handleStyleChange),this._resolveLayers(e,this._deck,[],this._props.layers),document.createElement("div")}_resolveLayers(e,o,r,n){Y(e,r,n)}onRemove(){let e=this._map;e&&(this._interleaved?this._onRemoveInterleaved(e):this._onRemoveOverlaid(e)),this._deck=void 0,this._map=void 0,this._container=void 0}_onRemoveOverlaid(e){e.off("resize",this._updateContainerSize),e.off("render",this._updateViewState),e.off("mousedown",this._handleMouseEvent),e.off("dragstart",this._handleMouseEvent),e.off("drag",this._handleMouseEvent),e.off("dragend",this._handleMouseEvent),e.off("mousemove",this._handleMouseEvent),e.off("mouseout",this._handleMouseEvent),e.off("click",this._handleMouseEvent),e.off("dblclick",this._handleMouseEvent),this._deck?.finalize()}_onRemoveInterleaved(e){e.off("styledata",this._handleStyleChange),this._resolveLayers(e,this._deck,this._props.layers,[]),K(e)}getDefaultPosition(){return"top-left"}pickObject(e){return(0,u.assert)(this._deck),this._deck.pickObject(e)}pickMultipleObjects(e){return(0,u.assert)(this._deck),this._deck.pickMultipleObjects(e)}pickObjects(e){return(0,u.assert)(this._deck),this._deck.pickObjects(e)}finalize(){this._map&&this._map.removeControl(this)}getCanvas(){return this._map?this._interleaved?this._map.getCanvas():this._deck.getCanvas():null}_getViews(e){if(!this._props.views)return w(e);let o=Array.isArray(this._props.views)?this._props.views:[this._props.views];return o.some(n=>n.id===m)?this._props.views:[w(e),...o]}};return pe(P);})();
|
|
8
8
|
return __exports__;
|
|
9
9
|
});
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "Use deck.gl layers as custom mapbox-gl-js layers",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"version": "9.3.
|
|
6
|
+
"version": "9.3.7",
|
|
7
7
|
"publishConfig": {
|
|
8
8
|
"access": "public"
|
|
9
9
|
},
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"@luma.gl/core": "~9.3.3",
|
|
46
46
|
"@math.gl/web-mercator": "^4.1.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "ac8cd3dd7a70b1f1471729425d63fcff38dc0a13"
|
|
49
49
|
}
|
|
@@ -79,6 +79,10 @@ export function resolveLayerGroups(map?: Map, oldLayers?: LayersList, newLayers?
|
|
|
79
79
|
const expectedGroupIndex =
|
|
80
80
|
beforeId === UNDEFINED_BEFORE_ID ? mapLayers.length : mapLayers.indexOf(beforeId);
|
|
81
81
|
|
|
82
|
+
if (expectedGroupIndex === -1) {
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
|
|
82
86
|
const currentGropupIndex = mapLayers.indexOf(groupId);
|
|
83
87
|
if (currentGropupIndex !== expectedGroupIndex - 1) {
|
|
84
88
|
const moveBeforeId = beforeId === UNDEFINED_BEFORE_ID ? undefined : beforeId;
|