From f44f7078706c1530da5665ff436376eabe804c7c Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Wed, 19 Apr 2023 12:43:37 +0200 Subject: [PATCH 1/4] Bump quadbin library to 0.1.8 --- modules/carto/package.json | 2 +- yarn.lock | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/modules/carto/package.json b/modules/carto/package.json index a6e94374afb..7d7ae879809 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -46,7 +46,7 @@ "h3-js": "^3.7.0", "moment-timezone": "^0.5.33", "pbf": "^3.2.1", - "quadbin": "^0.1.2" + "quadbin": "^0.1.8" }, "devDependencies": { "@loaders.gl/schema": "^3.3.3", diff --git a/yarn.lock b/yarn.lock index d7e619cc9b1..7fd2db9c8be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2922,6 +2922,13 @@ resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI= +"@mapbox/tile-cover@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@mapbox/tile-cover/-/tile-cover-3.0.1.tgz#ad0dbe69d02e4e9ff74bf228b3ee8fa533034210" + integrity sha512-R8aoFY/87HWBOL9E2eBqzOY2lpfWYXCcTNgBpIxAv67rqQeD4IfnHD0iPXg/Z1cqXrklegEYZCp/7ZR/RsWqBQ== + dependencies: + tilebelt "^1.0.1" + "@mapbox/tiny-sdf@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz#16a20c470741bfe9191deb336f46e194da4a91ff" @@ -10350,10 +10357,12 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== -quadbin@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.2.tgz#7af916bcdb4dbbbb2722b076906b9dab25bd6647" - integrity sha512-tARFTuto2M11HqBTiVAEkagfTlkf+8dHfqiSG+yEYNo7Na4pvsjBLAkrdysp+AUnqSg8ZwHPigtK7u4CmaIySw== +quadbin@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.8.tgz#381b201d3c830d245ed98748264d77c61cc29d78" + integrity sha512-vepXGmk3A3yulL7HmUsGnz3njKLuAoiHLln5RbxOa3hqiX76r5AQxpguTs5cKU/4t6j74nO3++KGqK00gFeihQ== + dependencies: + "@mapbox/tile-cover" "3.0.1" querystring@0.2.0: version "0.2.0" @@ -11924,6 +11933,11 @@ through@2.3.4: resolved "https://registry.yarnpkg.com/through/-/through-2.3.4.tgz#495e40e8d8a8eaebc7c275ea88c2b8fc14c56455" integrity sha1-SV5A6Nio6uvHwnXqiMK4/BTFZFU= +tilebelt@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tilebelt/-/tilebelt-1.0.1.tgz#3bbf7113b3fec468efb0d9148f4bb71ef126a21a" + integrity sha512-cxHzpa5JgsugY9NUVRH43gPaGJw/29LecAn4X7UGOP64+kB8pU4VQ3bIhSyfb5Mk4jDxwl3yk330L/EIhbJ5aw== + tinyqueue@^2.0.0, tinyqueue@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" From 71d8998e6cbea99ff36c1b7a64c1fe1ce29ee323 Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Wed, 19 Apr 2023 13:12:31 +0200 Subject: [PATCH 2/4] Appease Typescript --- modules/carto/src/layers/quadbin-tileset-2d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/carto/src/layers/quadbin-tileset-2d.ts b/modules/carto/src/layers/quadbin-tileset-2d.ts index 72f01261bc6..835f92e6f84 100644 --- a/modules/carto/src/layers/quadbin-tileset-2d.ts +++ b/modules/carto/src/layers/quadbin-tileset-2d.ts @@ -1,9 +1,9 @@ import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers'; -import {bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell} from 'quadbin'; +import {bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell, Quadbin} from 'quadbin'; // For calculations bigint representation is used, but // for constructing URL also provide the hexidecimal value -type QuadbinTileIndex = {q: bigint; i?: string}; +type QuadbinTileIndex = {q: Quadbin; i?: string}; export default class QuadbinTileset2D extends Tileset2D { // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT From 0c6a5a30e3a4793a13b2513e21e0735292dbe0e8 Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Thu, 20 Apr 2023 10:18:10 +0200 Subject: [PATCH 3/4] Update again to 0.1.9 --- modules/carto/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/carto/package.json b/modules/carto/package.json index 7d7ae879809..e980927add4 100644 --- a/modules/carto/package.json +++ b/modules/carto/package.json @@ -46,7 +46,7 @@ "h3-js": "^3.7.0", "moment-timezone": "^0.5.33", "pbf": "^3.2.1", - "quadbin": "^0.1.8" + "quadbin": "^0.1.9" }, "devDependencies": { "@loaders.gl/schema": "^3.3.3", diff --git a/yarn.lock b/yarn.lock index 7fd2db9c8be..7037340f89e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10357,10 +10357,10 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== -quadbin@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.8.tgz#381b201d3c830d245ed98748264d77c61cc29d78" - integrity sha512-vepXGmk3A3yulL7HmUsGnz3njKLuAoiHLln5RbxOa3hqiX76r5AQxpguTs5cKU/4t6j74nO3++KGqK00gFeihQ== +quadbin@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.9.tgz#322bd5f8b63960ef0a31a8b69863b0a0ab0b2e22" + integrity sha512-5V6m6+cL/6+uBl3hYL+CWF06rRvlHkIepYKGQjTLYaHhu9InPppql0+0ROiCaOQdz8gPNlgge3glk5Qg1mWOYw== dependencies: "@mapbox/tile-cover" "3.0.1" From 021915487dc8af33922f6d89b8312e5fead0dc0e Mon Sep 17 00:00:00 2001 From: Felix Palmer Date: Thu, 20 Apr 2023 10:41:47 +0200 Subject: [PATCH 4/4] Revert "Appease Typescript" This reverts commit 71d8998e6cbea99ff36c1b7a64c1fe1ce29ee323. --- modules/carto/src/layers/quadbin-tileset-2d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/carto/src/layers/quadbin-tileset-2d.ts b/modules/carto/src/layers/quadbin-tileset-2d.ts index 835f92e6f84..72f01261bc6 100644 --- a/modules/carto/src/layers/quadbin-tileset-2d.ts +++ b/modules/carto/src/layers/quadbin-tileset-2d.ts @@ -1,9 +1,9 @@ import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers'; -import {bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell, Quadbin} from 'quadbin'; +import {bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell} from 'quadbin'; // For calculations bigint representation is used, but // for constructing URL also provide the hexidecimal value -type QuadbinTileIndex = {q: Quadbin; i?: string}; +type QuadbinTileIndex = {q: bigint; i?: string}; export default class QuadbinTileset2D extends Tileset2D { // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT