From 0c82cbc3229e87911a4f99c1dc30c4ff3e860606 Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Wed, 4 Jun 2025 14:26:31 +0200 Subject: [PATCH 1/3] Import LayerFactory now that deck.gl exports it --- examples/06-fetch-map/app.ts | 38 ++----- package.json | 18 ++-- yarn.lock | 191 ++++++++++++++++++----------------- 3 files changed, 114 insertions(+), 133 deletions(-) diff --git a/examples/06-fetch-map/app.ts b/examples/06-fetch-map/app.ts index 5a1fb422..35889aa2 100644 --- a/examples/06-fetch-map/app.ts +++ b/examples/06-fetch-map/app.ts @@ -5,7 +5,6 @@ import { getDataFilterExtensionProps, GoogleBasemap, LayerDescriptor, - LayerType, MapLibreBasemap, } from '@carto/api-client'; import {_ConstructorOf, Deck, Layer} from '@deck.gl/core'; @@ -15,14 +14,7 @@ import 'maplibre-gl/dist/maplibre-gl.css'; import {Loader} from '@googlemaps/js-api-loader'; import {GoogleMapsOverlay} from '@deck.gl/google-maps'; import {MapboxOverlay} from '@deck.gl/mapbox'; -import { - ClusterTileLayer, - H3TileLayer, - HeatmapTileLayer, - VectorTileLayer, - QuadbinTileLayer, - RasterTileLayer, -} from '@deck.gl/carto'; +import {LayerFactory} from '@deck.gl/carto'; import {createLegend} from './legend.js'; type FetchMapResult = any; // TODO: fix type @@ -34,29 +26,15 @@ const GOOGLE_MAPS_API_KEY = ''; const apiBaseUrl = 'https://gcp-us-east1.api.carto.com'; // const apiBaseUrl = 'https://gcp-us-east1-05.dev.api.carto.com'; -// For now, define here. Eventually LayerFactory will be available in @deck.gl/carto -const layerClasses: Record> = { - clusterTile: ClusterTileLayer, - h3: H3TileLayer, - heatmapTile: HeatmapTileLayer, - mvt: VectorTileLayer, - quadbin: QuadbinTileLayer, - raster: RasterTileLayer, - tileset: VectorTileLayer, -}; -function LayerFactory(layers: LayerDescriptor[]) { +function createLayers(layers: LayerDescriptor[]) { return layers - .map(({type, props, filters}) => { - const LayerClass = layerClasses[type]; - if (!LayerClass) { - console.error(`No layer class found for type: ${type}`); - return null; - } + .map((descriptor) => { + const {filters} = descriptor; const filterProps = filters && { ...getDataFilterExtensionProps(filters), extensions: [new DataFilterExtension({filterSize: 4})], }; - return new LayerClass({...props, ...filterProps}); + return LayerFactory({...descriptor, props: {...descriptor.props, ...filterProps}}); }) .filter(Boolean); } @@ -77,7 +55,7 @@ function createMapWithMapLibreOverlay(result: FetchMapResult) { }) ); - const overlay = new MapboxOverlay({layers: LayerFactory(result.layers)}); + const overlay = new MapboxOverlay({layers: createLayers(result.layers)}); map.addControl(overlay); return overlay; @@ -95,7 +73,7 @@ async function createMapWithGoogleMapsOverlay(result: FetchMapResult) { disableDefaultUI: true, }); - const overlay = new GoogleMapsOverlay({layers: LayerFactory(result.layers)}); + const overlay = new GoogleMapsOverlay({layers: createLayers(result.layers)}); overlay.setMap(map); return overlay; @@ -116,7 +94,7 @@ async function createMap(cartoMapId: string) { // Autorefresh the data every 5 seconds options.autoRefresh = 5; options.onNewData = (result) => { - deck?.setProps({layers: LayerFactory(result.layers)}); + deck?.setProps({layers: createLayers(result.layers)}); }; } diff --git a/package.json b/package.json index 2de9f591..bee9827e 100644 --- a/package.json +++ b/package.json @@ -74,15 +74,15 @@ "quadbin": "^0.4.1-alpha.0" }, "devDependencies": { - "@deck.gl/aggregation-layers": "~9.1.6", - "@deck.gl/carto": "~9.1.6", - "@deck.gl/core": "~9.1.6", - "@deck.gl/extensions": "~9.1.6", - "@deck.gl/geo-layers": "~9.1.6", - "@deck.gl/google-maps": "~9.1.6", - "@deck.gl/layers": "~9.1.6", - "@deck.gl/mapbox": "~9.1.6", - "@deck.gl/mesh-layers": "~9.1.6", + "@deck.gl/aggregation-layers": "~9.2.0-alpha.2", + "@deck.gl/carto": "~9.2.0-alpha.2", + "@deck.gl/core": "~9.2.0-alpha.2", + "@deck.gl/extensions": "~9.2.0-alpha.2", + "@deck.gl/geo-layers": "~9.2.0-alpha.2", + "@deck.gl/google-maps": "~9.2.0-alpha.2", + "@deck.gl/layers": "~9.2.0-alpha.2", + "@deck.gl/mapbox": "~9.2.0-alpha.2", + "@deck.gl/mesh-layers": "~9.2.0-alpha.2", "@eslint/js": "^9.21.0", "@googlemaps/js-api-loader": "^1.16.6", "@lit/react": "^1.0.7", diff --git a/yarn.lock b/yarn.lock index 71372759..1b217f63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -231,15 +231,15 @@ __metadata: version: 0.0.0-use.local resolution: "@carto/api-client@workspace:." dependencies: - "@deck.gl/aggregation-layers": "npm:~9.1.6" - "@deck.gl/carto": "npm:~9.1.6" - "@deck.gl/core": "npm:~9.1.6" - "@deck.gl/extensions": "npm:~9.1.6" - "@deck.gl/geo-layers": "npm:~9.1.6" - "@deck.gl/google-maps": "npm:~9.1.6" - "@deck.gl/layers": "npm:~9.1.6" - "@deck.gl/mapbox": "npm:~9.1.6" - "@deck.gl/mesh-layers": "npm:~9.1.6" + "@deck.gl/aggregation-layers": "npm:~9.2.0-alpha.2" + "@deck.gl/carto": "npm:~9.2.0-alpha.2" + "@deck.gl/core": "npm:~9.2.0-alpha.2" + "@deck.gl/extensions": "npm:~9.2.0-alpha.2" + "@deck.gl/geo-layers": "npm:~9.2.0-alpha.2" + "@deck.gl/google-maps": "npm:~9.2.0-alpha.2" + "@deck.gl/layers": "npm:~9.2.0-alpha.2" + "@deck.gl/mapbox": "npm:~9.2.0-alpha.2" + "@deck.gl/mesh-layers": "npm:~9.2.0-alpha.2" "@eslint/js": "npm:^9.21.0" "@googlemaps/js-api-loader": "npm:^1.16.6" "@lit/react": "npm:^1.0.7" @@ -293,37 +293,37 @@ __metadata: languageName: unknown linkType: soft -"@deck.gl/aggregation-layers@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/aggregation-layers@npm:9.1.12" +"@deck.gl/aggregation-layers@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/aggregation-layers@npm:9.2.0-alpha.2" dependencies: - "@luma.gl/constants": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/constants": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" "@math.gl/core": "npm:^4.1.0" "@math.gl/web-mercator": "npm:^4.1.0" d3-hexbin: "npm:^0.2.1" peerDependencies: "@deck.gl/core": ^9.1.0 "@deck.gl/layers": ^9.1.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/engine": ^9.1.5 - checksum: 10c0/805752935feeec920dd5b0ac554aed63582a2a2380cc09c79bc34bf78b85021b6b9192e2a451ff3cc3c6dd8e73c975cf51ecee832f561f0c7bee338df35b7366 + "@luma.gl/core": ^9.1.9 + "@luma.gl/engine": ^9.1.9 + checksum: 10c0/2567f674a0602d9033ad48a36bc225aa873a3c24b2787f547206bbad4288516c2de6c3bdd8c31a6feb11c7e9841464ea41172a3b2bb964ac2b4f1c43e42709dd languageName: node linkType: hard -"@deck.gl/carto@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/carto@npm:9.1.12" +"@deck.gl/carto@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/carto@npm:9.2.0-alpha.2" dependencies: - "@carto/api-client": "npm:^0.4.4" + "@carto/api-client": "npm:^0.5.6" "@loaders.gl/compression": "npm:^4.2.0" "@loaders.gl/gis": "npm:^4.2.0" "@loaders.gl/loader-utils": "npm:^4.2.0" "@loaders.gl/mvt": "npm:^4.2.0" "@loaders.gl/schema": "npm:^4.2.0" "@loaders.gl/tiles": "npm:^4.2.0" - "@luma.gl/core": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/core": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" "@math.gl/web-mercator": "npm:^4.1.0" "@types/d3-array": "npm:^3.0.2" "@types/d3-color": "npm:^1.4.2" @@ -345,22 +345,22 @@ __metadata: "@deck.gl/geo-layers": ^9.1.0 "@deck.gl/layers": ^9.1.0 "@loaders.gl/core": ^4.2.0 - "@luma.gl/core": ^9.1.5 - checksum: 10c0/7d875885dbae732ee322d5f5736ae215c9d26ada5c44fff6f7c118df6a19758674f7777cb76c4959891f4c7b131ef2bac95860ab41ec64e7301ac72df876f04e + "@luma.gl/core": ^9.1.9 + checksum: 10c0/ec4c8dd7dd12b9e911d9acca2b472a1664883bdb211354afff223a28600c172fb6facf920042d8b811cd40d8b61200af6ca16b3518263540e6f15726d8f3a121 languageName: node linkType: hard -"@deck.gl/core@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/core@npm:9.1.12" +"@deck.gl/core@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/core@npm:9.2.0-alpha.2" dependencies: "@loaders.gl/core": "npm:^4.2.0" "@loaders.gl/images": "npm:^4.2.0" - "@luma.gl/constants": "npm:^9.1.5" - "@luma.gl/core": "npm:^9.1.5" - "@luma.gl/engine": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" - "@luma.gl/webgl": "npm:^9.1.5" + "@luma.gl/constants": "npm:^9.1.9" + "@luma.gl/core": "npm:^9.1.9" + "@luma.gl/engine": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" + "@luma.gl/webgl": "npm:^9.1.9" "@math.gl/core": "npm:^4.1.0" "@math.gl/sun": "npm:^4.1.0" "@math.gl/types": "npm:^4.1.0" @@ -371,28 +371,28 @@ __metadata: "@types/offscreencanvas": "npm:^2019.6.4" gl-matrix: "npm:^3.0.0" mjolnir.js: "npm:^3.0.0" - checksum: 10c0/015820eeafe95284ec5b5e00a8a92c700573fe9a6152e47f8d30c280665d551e1b5b818637e3498e8314e9bb8d9a890ae9337cc1ecd128e7a20813f40bd22274 + checksum: 10c0/1edf4bd30c40f5e9c266235b3e5e984dd3604689153c34848e04231eb34c76537801262af5a7a2256f4f591f0d531873b11ac87e639b66d8c36c95c62d37087b languageName: node linkType: hard -"@deck.gl/extensions@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/extensions@npm:9.1.12" +"@deck.gl/extensions@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/extensions@npm:9.2.0-alpha.2" dependencies: - "@luma.gl/constants": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/constants": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" "@math.gl/core": "npm:^4.1.0" peerDependencies: "@deck.gl/core": ^9.1.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/engine": ^9.1.5 - checksum: 10c0/1c7c8fa16512f0f21b44d8d2329e0d6a627f9c15e86e6aa4d5e3f0706b97ac381de28a2ae581c60acd28134d155ed5fd1f01e5e2282a6bd43ef7d21a5ccd9b58 + "@luma.gl/core": ^9.1.9 + "@luma.gl/engine": ^9.1.9 + checksum: 10c0/56c85a486e12a5283a79e804452f350e534f5085b7092024bf0b58a52d5fe7d97c35fc5fa702a3f8869ee787b9d4dab6e6164a31b331352a538973f156d5bf3f languageName: node linkType: hard -"@deck.gl/geo-layers@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/geo-layers@npm:9.1.12" +"@deck.gl/geo-layers@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/geo-layers@npm:9.2.0-alpha.2" dependencies: "@loaders.gl/3d-tiles": "npm:^4.2.0" "@loaders.gl/gis": "npm:^4.2.0" @@ -402,12 +402,13 @@ __metadata: "@loaders.gl/terrain": "npm:^4.2.0" "@loaders.gl/tiles": "npm:^4.2.0" "@loaders.gl/wms": "npm:^4.2.0" - "@luma.gl/gltf": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/gltf": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" "@math.gl/core": "npm:^4.1.0" "@math.gl/culling": "npm:^4.1.0" "@math.gl/web-mercator": "npm:^4.1.0" "@types/geojson": "npm:^7946.0.8" + a5-js: "npm:^0.1.3" h3-js: "npm:^4.1.0" long: "npm:^3.2.0" peerDependencies: @@ -416,34 +417,34 @@ __metadata: "@deck.gl/layers": ^9.1.0 "@deck.gl/mesh-layers": ^9.1.0 "@loaders.gl/core": ^4.2.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/engine": ^9.1.5 - checksum: 10c0/68d23c02cef1544c016789153f9b72e668cd1b7107a33e492b5c5f95ad7e9f3b1e1d9cc37dfaf755f7e47b58c265100e716ee72ea757fdb9f01047731176aa78 + "@luma.gl/core": ^9.1.9 + "@luma.gl/engine": ^9.1.9 + checksum: 10c0/37355db5a84ed87d0de06c7063d511eadc318f67f0b30701cda9d6c5c5b76cc4c14a88b937d1f7113562ca9f35de3ac1cba332b27c7318a5a21ba13e7f5b1117 languageName: node linkType: hard -"@deck.gl/google-maps@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/google-maps@npm:9.1.12" +"@deck.gl/google-maps@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/google-maps@npm:9.2.0-alpha.2" dependencies: - "@luma.gl/constants": "npm:^9.1.5" + "@luma.gl/constants": "npm:^9.1.9" "@math.gl/core": "npm:^4.1.0" "@types/google.maps": "npm:^3.48.6" peerDependencies: "@deck.gl/core": ^9.1.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/webgl": ^9.1.5 - checksum: 10c0/ab642f9817c486cfcceb167def5ed51e98b8939a7c326bfc8e83a041859b3c4d8780241bf00ccdf4335d38d74467dbf631ebb951a84f775b220be06eb50c4bf3 + "@luma.gl/core": ^9.1.9 + "@luma.gl/webgl": ^9.1.9 + checksum: 10c0/589c0bb40177358a8d9bb466a84e8d86806d238fa6c3ba8434feca883b8620adfa5f2a0f61aad6f4c79ac116df6baec10b4466e0034662f552bf2a9c932e90b4 languageName: node linkType: hard -"@deck.gl/layers@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/layers@npm:9.1.12" +"@deck.gl/layers@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/layers@npm:9.2.0-alpha.2" dependencies: "@loaders.gl/images": "npm:^4.2.0" "@loaders.gl/schema": "npm:^4.2.0" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/shadertools": "npm:^9.1.9" "@mapbox/tiny-sdf": "npm:^2.0.5" "@math.gl/core": "npm:^4.1.0" "@math.gl/polygon": "npm:^4.1.0" @@ -452,37 +453,37 @@ __metadata: peerDependencies: "@deck.gl/core": ^9.1.0 "@loaders.gl/core": ^4.2.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/engine": ^9.1.5 - checksum: 10c0/4af34d8551c4111a9fc42bc879725cdd9216521f8afb5e2bcda78f56f1a224dce66c6c779cf01a145b3b5c47305432126a41b29e45b6007047947212d9cd2b48 + "@luma.gl/core": ^9.1.9 + "@luma.gl/engine": ^9.1.9 + checksum: 10c0/f51a88adcd3a752571312c63e44309c817b4211cdfe3418f9ffa1362a9ea8b35aabdd5409448b56f459d1311149cce82b23a944a1768a41edbfdf2634f8d1900 languageName: node linkType: hard -"@deck.gl/mapbox@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/mapbox@npm:9.1.12" +"@deck.gl/mapbox@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/mapbox@npm:9.2.0-alpha.2" dependencies: - "@luma.gl/constants": "npm:^9.1.5" + "@luma.gl/constants": "npm:^9.1.9" "@math.gl/web-mercator": "npm:^4.1.0" peerDependencies: "@deck.gl/core": ^9.1.0 - "@luma.gl/core": ^9.1.5 - checksum: 10c0/cfb2f24efa4cbb22a97d4eac5dc942e21e60cb7f9e47eb36c2beb3b50eafb30c1bfd5b4e1d04b97b1a448445badfb2e5f1b085adb5fe52acc2c9c1d815af5a79 + "@luma.gl/core": ^9.1.9 + checksum: 10c0/8fd3c9be94eaac8ca18cbdc3e57c8cfe7f09c1b8c71948c55b42f6922f7dbecde39adf9e7dd3d34f3831a095e9eee48a25c333687dfc4c865609807dafd059d3 languageName: node linkType: hard -"@deck.gl/mesh-layers@npm:~9.1.6": - version: 9.1.12 - resolution: "@deck.gl/mesh-layers@npm:9.1.12" +"@deck.gl/mesh-layers@npm:~9.2.0-alpha.2": + version: 9.2.0-alpha.2 + resolution: "@deck.gl/mesh-layers@npm:9.2.0-alpha.2" dependencies: "@loaders.gl/gltf": "npm:^4.2.0" - "@luma.gl/gltf": "npm:^9.1.5" - "@luma.gl/shadertools": "npm:^9.1.5" + "@luma.gl/gltf": "npm:^9.1.9" + "@luma.gl/shadertools": "npm:^9.1.9" peerDependencies: "@deck.gl/core": ^9.1.0 - "@luma.gl/core": ^9.1.5 - "@luma.gl/engine": ^9.1.5 - checksum: 10c0/61799e59ebe775762afe4d21e8b5fa292e29253912d55eb0217f50ff537ecb6bc36d9263c2109a173b5ab7923e63fe3193b58ad37f3e3720900a33a3b379627c + "@luma.gl/core": ^9.1.9 + "@luma.gl/engine": ^9.1.9 + checksum: 10c0/0959afc6487e55a933e6d6c40e0b43545fa205966fc002091cc5489250129ef3bb1b35587e586f3a4cf4f17b165d2c0a98ef773c053c2dcd663c1e39b94c8443 languageName: node linkType: hard @@ -1281,21 +1282,14 @@ __metadata: languageName: node linkType: hard -"@luma.gl/constants@npm:9.1.9": +"@luma.gl/constants@npm:9.1.9, @luma.gl/constants@npm:^9.1.9": version: 9.1.9 resolution: "@luma.gl/constants@npm:9.1.9" checksum: 10c0/77b232a8cf9720cdbb80bdf703cbc9e3acae934536a76df4d90e07a094e514d57d94f8eb81a8ac75e23a9c2c6ab5438f75fab3a001d472e9f440a0a1b148e21e languageName: node linkType: hard -"@luma.gl/constants@npm:^9.1.5": - version: 9.1.5 - resolution: "@luma.gl/constants@npm:9.1.5" - checksum: 10c0/713ddd4c9ced9e2f3c04c841df04b9f1a49ef0a636d88a091de25aa2c8fe903764953f1cd773a341df5bfe20365fb98e08d73ea2bc70609ca37a7e05cb410850 - languageName: node - linkType: hard - -"@luma.gl/core@npm:^9.1.5, @luma.gl/core@npm:~9.1.5": +"@luma.gl/core@npm:^9.1.9, @luma.gl/core@npm:~9.1.5": version: 9.1.9 resolution: "@luma.gl/core@npm:9.1.9" dependencies: @@ -1308,7 +1302,7 @@ __metadata: languageName: node linkType: hard -"@luma.gl/engine@npm:^9.1.5, @luma.gl/engine@npm:~9.1.5": +"@luma.gl/engine@npm:^9.1.9, @luma.gl/engine@npm:~9.1.5": version: 9.1.9 resolution: "@luma.gl/engine@npm:9.1.9" dependencies: @@ -1323,9 +1317,9 @@ __metadata: languageName: node linkType: hard -"@luma.gl/gltf@npm:^9.1.5": - version: 9.1.5 - resolution: "@luma.gl/gltf@npm:9.1.5" +"@luma.gl/gltf@npm:^9.1.9": + version: 9.1.9 + resolution: "@luma.gl/gltf@npm:9.1.9" dependencies: "@loaders.gl/core": "npm:^4.2.0" "@loaders.gl/textures": "npm:^4.2.0" @@ -1334,11 +1328,11 @@ __metadata: "@luma.gl/core": ^9.1.0 "@luma.gl/engine": ^9.1.0 "@luma.gl/shadertools": ^9.1.0 - checksum: 10c0/1740c3da1c504106640c85233178cddd6eb5326b97c12df68a993bee819c39ed100f4b3f2a6a3c2b3b8ef43c73cb5434881e1121d0efb0f01db2baf3710fdba0 + checksum: 10c0/5d4e8da4c186e004feed5a78823da1482a23ed85f9cd6c6a6cacbfbf275100653a78ecfcf9813186e4b07e37c9989db7e97c10c936540a0b18d2034cf3ced158 languageName: node linkType: hard -"@luma.gl/shadertools@npm:^9.1.5, @luma.gl/shadertools@npm:~9.1.5": +"@luma.gl/shadertools@npm:^9.1.9, @luma.gl/shadertools@npm:~9.1.5": version: 9.1.9 resolution: "@luma.gl/shadertools@npm:9.1.9" dependencies: @@ -1351,7 +1345,7 @@ __metadata: languageName: node linkType: hard -"@luma.gl/webgl@npm:^9.1.5, @luma.gl/webgl@npm:~9.1.5": +"@luma.gl/webgl@npm:^9.1.9, @luma.gl/webgl@npm:~9.1.5": version: 9.1.9 resolution: "@luma.gl/webgl@npm:9.1.9" dependencies: @@ -2517,6 +2511,15 @@ __metadata: languageName: node linkType: hard +"a5-js@npm:^0.1.3": + version: 0.1.4 + resolution: "a5-js@npm:0.1.4" + dependencies: + gl-matrix: "npm:^3.4.3" + checksum: 10c0/7b3e33cac46181ccef89f49c7effa4046344e74ec69b576c49becd874cc9df5ae5fd6a6a35bb2d7af0796000a20594ca6ca06934a2bd87d6bcd8a51c2f59fd29 + languageName: node + linkType: hard + "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" From 3ee3926df51856419f0a09685efcd7c0c4edaad5 Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Wed, 4 Jun 2025 14:27:08 +0200 Subject: [PATCH 2/3] Lint --- examples/06-fetch-map/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/06-fetch-map/app.ts b/examples/06-fetch-map/app.ts index 35889aa2..ab3c2cf8 100644 --- a/examples/06-fetch-map/app.ts +++ b/examples/06-fetch-map/app.ts @@ -7,7 +7,7 @@ import { LayerDescriptor, MapLibreBasemap, } from '@carto/api-client'; -import {_ConstructorOf, Deck, Layer} from '@deck.gl/core'; +import {Deck} from '@deck.gl/core'; import {DataFilterExtension} from '@deck.gl/extensions'; import maplibregl from 'maplibre-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; From 53db23fdcc47e60c6a66cc8f5ea89334d68b65c8 Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Wed, 4 Jun 2025 14:32:19 +0200 Subject: [PATCH 3/3] Format --- examples/06-fetch-map/app.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/06-fetch-map/app.ts b/examples/06-fetch-map/app.ts index ab3c2cf8..d3433d93 100644 --- a/examples/06-fetch-map/app.ts +++ b/examples/06-fetch-map/app.ts @@ -34,7 +34,10 @@ function createLayers(layers: LayerDescriptor[]) { ...getDataFilterExtensionProps(filters), extensions: [new DataFilterExtension({filterSize: 4})], }; - return LayerFactory({...descriptor, props: {...descriptor.props, ...filterProps}}); + return LayerFactory({ + ...descriptor, + props: {...descriptor.props, ...filterProps}, + }); }) .filter(Boolean); }