Skip to content
Open
Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions modules/aggregation-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/shadertools": "^9.3.4",
"@math.gl/core": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
"d3-hexbin": "^0.2.1"
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@deck.gl/layers": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/arcgis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"peerDependencies": {
"@arcgis/core": "^4.0.0",
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3",
"@luma.gl/webgl": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4",
"@luma.gl/webgl": "~9.3.4"
},
"devDependencies": {
"@arcgis/core": "^4.21.0"
Expand Down
6 changes: 3 additions & 3 deletions modules/carto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"@loaders.gl/mvt": "^4.4.3",
"@loaders.gl/schema": "^4.4.3",
"@loaders.gl/tiles": "^4.4.3",
"@luma.gl/core": "^9.3.3",
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/core": "^9.3.4",
"@luma.gl/shadertools": "^9.3.4",
"@math.gl/web-mercator": "^4.1.0",
"@types/d3-array": "^3.0.2",
"@types/d3-color": "^3.1.3",
Expand All @@ -73,7 +73,7 @@
"@deck.gl/geo-layers": "~9.3.0-beta.2",
"@deck.gl/layers": "~9.3.0-beta.2",
"@loaders.gl/core": "^4.4.3",
"@luma.gl/core": "~9.3.3"
"@luma.gl/core": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions modules/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"dependencies": {
"@loaders.gl/core": "^4.4.3",
"@loaders.gl/images": "^4.4.3",
"@luma.gl/core": "^9.3.3",
"@luma.gl/engine": "^9.3.3",
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/webgl": "^9.3.3",
"@luma.gl/core": "^9.3.4",
"@luma.gl/engine": "^9.3.4",
"@luma.gl/shadertools": "^9.3.4",
"@luma.gl/webgl": "^9.3.4",
"@math.gl/core": "^4.1.0",
"@math.gl/sun": "^4.1.0",
"@math.gl/types": "^4.1.0",
Expand Down
8 changes: 4 additions & 4 deletions modules/extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/webgl": "^9.3.3",
"@luma.gl/shadertools": "^9.3.4",
"@luma.gl/webgl": "^9.3.4",
"@math.gl/core": "^4.1.0"
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions modules/geo-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@loaders.gl/terrain": "^4.4.3",
"@loaders.gl/tiles": "^4.4.3",
"@loaders.gl/wms": "^4.4.3",
"@luma.gl/gltf": "^9.3.3",
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/gltf": "^9.3.4",
"@luma.gl/shadertools": "^9.3.4",
"@math.gl/core": "^4.1.0",
"@math.gl/culling": "^4.1.0",
"@math.gl/web-mercator": "^4.1.0",
Expand All @@ -62,8 +62,8 @@
"@deck.gl/layers": "~9.3.0-beta.2",
"@deck.gl/mesh-layers": "~9.3.0-beta.2",
"@loaders.gl/core": "^4.4.3",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/google-maps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/webgl": "^9.3.3",
"@luma.gl/webgl": "^9.3.4",
"@math.gl/core": "^4.1.0",
"@types/google.maps": "^3.48.6"
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/webgl": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/webgl": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
11 changes: 11 additions & 0 deletions modules/google-maps/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ export function createDeckInstance(
// The basemap owns the shared canvas in interleaved mode; Deck only forwards the preferred DPR.
// In non-interleaved mode this still feeds the luma canvas context that Deck creates.
useDevicePixels: props.useDevicePixels ?? true,
...(!props.gl && {
deviceProps: {
...props.deviceProps,
createCanvasContext: {
...(typeof props.deviceProps?.createCanvasContext === 'object'
? props.deviceProps.createCanvasContext
: undefined),
pixelSizeSource: 'css-dpr'
}
}
}),
style: props.interleaved ? null : {pointerEvents: 'none'},
parent: getContainer(overlay, props.style),
views: new MapView({repeat: true}),
Expand Down
4 changes: 2 additions & 2 deletions modules/jupyter-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"@loaders.gl/3d-tiles": "^4.4.3",
"@loaders.gl/core": "^4.4.3",
"@loaders.gl/csv": "^4.4.3",
"@luma.gl/core": "^9.3.3",
"@luma.gl/webgl": "^9.3.3",
"@luma.gl/core": "^9.3.4",
"@luma.gl/webgl": "^9.3.4",
"d3-dsv": "^1.0.8",
"mapbox-gl": "^1.13.2",
"maplibre-gl": "^5.14.0"
Expand Down
6 changes: 3 additions & 3 deletions modules/layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@loaders.gl/images": "^4.4.3",
"@loaders.gl/schema": "^4.4.3",
"@luma.gl/shadertools": "^9.3.3",
"@luma.gl/shadertools": "^9.3.4",
"@mapbox/tiny-sdf": "^2.0.5",
"@math.gl/core": "^4.1.0",
"@math.gl/polygon": "^4.1.0",
Expand All @@ -49,8 +49,8 @@
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@loaders.gl/core": "^4.4.3",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
4 changes: 2 additions & 2 deletions modules/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@deck.gl/react": "9.3.0-beta.2",
"@deck.gl/widgets": "9.3.0-beta.2",
"@loaders.gl/core": "^4.4.3",
"@luma.gl/core": "^9.3.3",
"@luma.gl/engine": "^9.3.3"
"@luma.gl/core": "^9.3.4",
"@luma.gl/engine": "^9.3.4"
},
"peerDependencies": {
"@arcgis/core": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/mapbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/core": "~9.3.4",
"@math.gl/web-mercator": "^4.1.0"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
Expand Down
9 changes: 9 additions & 0 deletions modules/mapbox/src/mapbox-overlay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ export default class MapboxOverlay implements IControl {
this._deck = new Deck<any>({
...this._props,
parent: container,
deviceProps: {
...this._props.deviceProps,
createCanvasContext: {
...(typeof this._props.deviceProps?.createCanvasContext === 'object'
? this._props.deviceProps.createCanvasContext
: undefined),
pixelSizeSource: 'css-dpr'
}
},
parameters: {...getDefaultParameters(map, false), ...this._props.parameters},
views: this._getViews(map),
viewState: getViewState(map)
Expand Down
12 changes: 6 additions & 6 deletions modules/mesh-layers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
"dependencies": {
"@loaders.gl/gltf": "^4.4.3",
"@loaders.gl/schema": "^4.4.3",
"@luma.gl/gltf": "^9.3.3",
"@luma.gl/shadertools": "^9.3.3"
"@luma.gl/gltf": "^9.3.4",
"@luma.gl/shadertools": "^9.3.4"
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3",
"@luma.gl/gltf": "~9.3.3",
"@luma.gl/shadertools": "~9.3.3"
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4",
"@luma.gl/gltf": "~9.3.4",
"@luma.gl/shadertools": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions modules/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"src"
],
"dependencies": {
"@luma.gl/test-utils": "^9.3.3",
"@luma.gl/webgl": "^9.3.3"
"@luma.gl/test-utils": "^9.3.4",
"@luma.gl/webgl": "^9.3.4"
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3",
"@luma.gl/engine": "~9.3.3",
"@luma.gl/core": "~9.3.4",
"@luma.gl/engine": "~9.3.4",
"@probe.gl/test-utils": "^4.1.1",
"vitest": "^4.0.18"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/widgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"peerDependencies": {
"@deck.gl/core": "~9.3.0-beta.2",
"@luma.gl/core": "~9.3.3"
"@luma.gl/core": "~9.3.4"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
"@floating-ui/dom": "^1.7.5",
"@loaders.gl/csv": "^4.4.3",
"@loaders.gl/polyfills": "^4.4.3",
"@luma.gl/core": "^9.3.3",
"@luma.gl/effects": "^9.3.3",
"@luma.gl/webgl": "^9.3.3",
"@luma.gl/webgpu": "^9.3.3",
"@luma.gl/core": "^9.3.4",
"@luma.gl/effects": "^9.3.4",
"@luma.gl/webgl": "^9.3.4",
"@luma.gl/webgpu": "^9.3.4",
"@math.gl/proj4": "^4.1.0",
"@probe.gl/bench": "^4.1.1",
"@probe.gl/test-utils": "^4.1.1",
Expand Down
Loading
Loading