Skip to content

Commit

Permalink
Add support for quadbin and remove quadkey and quadint (#442)
Browse files Browse the repository at this point in the history
  • Loading branch information
@padawannn
padawannn authored Jul 1, 2022
1 parent 0739283 commit e3a90bc
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 59 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

## Not released
- Add support for quadbin and remove quadkey and quadint [#442](https://github.com/CartoDB/carto-react/pull/442)

## 1.3

Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"packages/*"
],
"devDependencies": {
"@deck.gl/aggregation-layers": "^8.8.0-beta.3",
"@deck.gl/carto": "^8.8.0-beta.3",
"@deck.gl/core": "^8.8.0-beta.3",
"@deck.gl/extensions": "^8.8.0-beta.3",
"@deck.gl/geo-layers": "^8.8.0-beta.3",
"@deck.gl/google-maps": "^8.8.0-beta.3",
"@deck.gl/layers": "^8.8.0-beta.3",
"@deck.gl/mesh-layers": "^8.8.0-beta.3",
"@deck.gl/aggregation-layers": "^8.8.0",
"@deck.gl/carto": "^8.8.0",
"@deck.gl/core": "^8.8.0",
"@deck.gl/extensions": "^8.8.0",
"@deck.gl/geo-layers": "^8.8.0",
"@deck.gl/google-maps": "^8.8.0",
"@deck.gl/layers": "^8.8.0",
"@deck.gl/mesh-layers": "^8.8.0",
"@mapbox/tile-cover": "^3.0.2",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
"@carto/react-core": "^1.3.0-alpha.11",
"@carto/react-redux": "^1.3.0-alpha.11",
"@carto/react-workers": "^1.3.0-alpha.11",
"@deck.gl/carto": "^8.8.0-beta.5",
"@deck.gl/core": "^8.8.0-beta.5",
"@deck.gl/extensions": "^8.8.0-beta.5",
"@deck.gl/carto": "^8.8.0",
"@deck.gl/core": "^8.8.0",
"@deck.gl/extensions": "^8.8.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-basemaps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"peerDependencies": {
"@carto/react-core": "^1.3.0-alpha.11",
"@deck.gl/google-maps": "^8.8.0-beta.5",
"@deck.gl/google-maps": "^8.8.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@babel/runtime": "^7.13.9"
},
"peerDependencies": {
"@deck.gl/carto": "^8.8.0-beta.5",
"@deck.gl/carto": "^8.8.0",
"@mapbox/tile-cover": "^3.0.2",
"@turf/bbox-clip": "^6.3.0",
"@turf/bbox-polygon": "^6.3.0",
Expand Down
13 changes: 7 additions & 6 deletions packages/react-core/src/filters/tileFeaturesSpatialIndex.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { indexes } from '@mapbox/tile-cover';
import { _quadbinZoom, _tileToQuadbin } from '@deck.gl/carto';
import { tiles } from '@mapbox/tile-cover';
// h3-js has a known problem that does not allow us to use it in a web-worker. To solve
// it we're overwriting the node_module package after install it (check postinstall script in the package.json and the patches/h3-js+3.7.2.patch file)
// To know more about the h3-js issue check https://github.com/uber/h3-js/issues/117
Expand Down Expand Up @@ -55,8 +56,8 @@ function getResolution(tiles, spatialIndex) {
return;
}

if (spatialIndex === SpatialIndex.QUADINT || spatialIndex === SpatialIndex.QUADKEY) {
return data[0].id.length;
if (spatialIndex === SpatialIndex.QUADBIN) {
return Number(_quadbinZoom(data[0].id));
}

if (spatialIndex === SpatialIndex.H3) {
Expand All @@ -68,11 +69,11 @@ const bboxWest = [-180, -90, 0, 90];
const bboxEast = [0, -90, 180, 90];

function getCellsCoverGeometry(geometry, spatialIndex, resolution) {
if (spatialIndex === SpatialIndex.QUADINT || spatialIndex === SpatialIndex.QUADKEY) {
return indexes(geometry, {
if (spatialIndex === SpatialIndex.QUADBIN) {
return tiles(geometry, {
min_zoom: resolution,
max_zoom: resolution
});
}).map(([x, y, z]) => _tileToQuadbin({ x, y, z }));
}

if (spatialIndex === SpatialIndex.H3) {
Expand Down
2 changes: 0 additions & 2 deletions packages/react-core/src/operations/constants/SpatialIndexTypes.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
export enum SpatialIndex {
H3 = 'h3',
S2 = 's2',
QUADKEY = 'quadkey',
QUADINT = 'quadint',
QUADBIN = 'quadbin'
}
2 changes: 0 additions & 2 deletions packages/react-core/src/operations/constants/SpatialIndexTypes.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
export const SpatialIndex = Object.freeze({
H3: 'h3',
S2: 's2',
QUADKEY: 'quadkey',
QUADINT: 'quadint',
QUADBIN: 'quadbin'
});
4 changes: 2 additions & 2 deletions packages/react-redux/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"peerDependencies": {
"@carto/react-core": "^1.3.0-alpha.11",
"@carto/react-workers": "^1.3.0-alpha.11",
"@deck.gl/carto": "^8.8.0-beta.5",
"@deck.gl/core": "^8.8.0-beta.5",
"@deck.gl/carto": "^8.8.0",
"@deck.gl/core": "^8.8.0",
"@reduxjs/toolkit": "^1.5.0"
}
}
4 changes: 2 additions & 2 deletions packages/react-widgets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
"@carto/react-redux": "^1.3.0-alpha.11",
"@carto/react-ui": "^1.3.0-alpha.11",
"@carto/react-workers": "^1.3.0-alpha.11",
"@deck.gl/core": "^8.8.0-beta.5",
"@deck.gl/layers": "^8.8.0-beta.5",
"@deck.gl/core": "^8.8.0",
"@deck.gl/layers": "^8.8.0",
"@material-ui/core": "^4.11.3",
"@nebula.gl/edit-modes": "^1.0.2-alpha.0",
"@nebula.gl/layers": "^1.0.2-alpha.0",
Expand Down
64 changes: 32 additions & 32 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1165,20 +1165,20 @@
enabled "2.0.x"
kuler "^2.0.0"

"@deck.gl/aggregation-layers@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.8.0-beta.3.tgz#ad6dfd2989174a9d8b5e5f93efbb81c33b339eac"
integrity sha512-jyxYOtP7E/c4cGnFaQU8wGvYDtrA4a/hlCSO3POZ/xXvstbbLNQJJxzeUohn3RMDZBQ+EMawQLfv0l1b4bLkOg==
"@deck.gl/aggregation-layers@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.8.0.tgz#cd2fb50aacec2cbb54091c1dce22211fdb4d13f8"
integrity sha512-ZeGLcviNGkRitb8CdH71PTv/29jiDSu3z7nW868bxfOXlvqNMa9eHmtI3tLzttj94EVRnJLtnmY1p8EszeNUaw==
dependencies:
"@luma.gl/constants" "^8.5.14"
"@luma.gl/shadertools" "^8.5.14"
"@math.gl/web-mercator" "^3.6.0"
d3-hexbin "^0.2.1"

"@deck.gl/carto@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.8.0-beta.3.tgz#e9b10a677695877fb5d77f4e0e14a212c441aeee"
integrity sha512-cfWkGE1Tk00t6dsOEj/XMMGbeVLZgGgtrn/e+zzRoA2OarJxXuQcZ+HlnnlsiDTO7+VZvxV5JJMzLT47ye3yig==
"@deck.gl/carto@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.8.0.tgz#8d37726021038c3347fd5e8efddb20e42627cf3e"
integrity sha512-CQ3hZBiqOg7d2A10uG24N8elsoq1ra2CMcjRACYjqobtmFKs79Ymjr71HOmtwrj2JNW9poVfQl5v2EepZeUXFg==
dependencies:
"@loaders.gl/gis" "^3.2.0"
"@loaders.gl/loader-utils" "^3.2.0"
Expand All @@ -1195,10 +1195,10 @@
moment-timezone "^0.5.33"
pbf "^3.2.1"

"@deck.gl/core@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.8.0-beta.3.tgz#b828f0a33ab95d0f5fd657d2f2ee79465df42b9e"
integrity sha512-UQNNOuT+eDFAs35/HU43TggHvWydKJk7/+MupwCAmk1SdghOmEZ8OlDlDcVxpm0BuhQdN//Taqnd3lzjG+/IRA==
"@deck.gl/core@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.8.0.tgz#cdcf66a83285bffa47c3fcfb231f4cb887a1b75e"
integrity sha512-bfmkCSMgM+uWfoIJtkQZZAPM8PHZvT8Wn+tXMWtzrqjdCyHhs09IapJ0qa2owLvoMxofSMYkn3uRtXWwrq21Uw==
dependencies:
"@loaders.gl/core" "^3.2.0"
"@loaders.gl/images" "^3.2.0"
Expand All @@ -1214,17 +1214,17 @@
math.gl "^3.6.0"
mjolnir.js "^2.7.0"

"@deck.gl/extensions@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.8.0-beta.3.tgz#52d4f23b0e5e8835c819c00e84f3b0e3753e5840"
integrity sha512-n0KLw4fFsEk2O/3rA3n8jw+3VNUbHt9K1QYciasBoLgTw29F7rOD4+NB+dTSAWalN5Uic0P/XDjUNQkTG/3EHw==
"@deck.gl/extensions@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.8.0.tgz#e2ce3c28619b6f068db86367365a5309a9c7136d"
integrity sha512-olzbg2csQTK7/F8Wyn/jtcEn0oBy9tfikSrHTz7pxzh0FR/OqY03RV5fI/FyM/GBdI36/i5DjmKb0WQcLzasUg==
dependencies:
"@luma.gl/shadertools" "^8.5.14"

"@deck.gl/geo-layers@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.8.0-beta.3.tgz#30cd0941eaefd4833d84ecdaea4ba6312ae76e5f"
integrity sha512-cs9UvaBr+VIerF9ejscCKSCByqITV3TzAnHjc+wNXLsHP9jfxUkT3n8ixGihOG3aIl8HCNgoe3xftOOwh3kVWw==
"@deck.gl/geo-layers@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.8.0.tgz#8eecabc334d19091c9d97274e35acd1e336f2461"
integrity sha512-caEL560g6IMxeEo+JOO7yHhVO2KSZv7DKbdcT/VYUjlDOqM5NRYgwiNzfeZDvbwLIHXR3MHKk+62n3/fWzu6XQ==
dependencies:
"@loaders.gl/3d-tiles" "^3.2.0"
"@loaders.gl/gis" "^3.2.0"
Expand All @@ -1242,15 +1242,15 @@
h3-js "^3.7.0"
long "^3.2.0"

"@deck.gl/google-maps@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.8.0-beta.3.tgz#ee006245de834eaba378cf6f43bb47b086508d45"
integrity sha512-jVFyCzGmuF1Pz1oI27vmpPdIdW7EQ3BUZeg8cuICs7z8Kg4k5JdBWhZNyQNUiWxSpbGawGR3oM6AmPUft2lJMw==
"@deck.gl/google-maps@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.8.0.tgz#511fdece4a7e0bc3430ed02d9a9c707dcbd681ea"
integrity sha512-gz2sdfnP1kU+S773OO+B+DOJ9ufezbYm05Mm+rBw2SuBUYwLnEbp7lp+LDrMwMvPQKqQsHHapBILyU8MiiF/eQ==

"@deck.gl/layers@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.8.0-beta.3.tgz#d3fe55e6c9f7079670c88d79929c6a3cd91c674c"
integrity sha512-YJrbDg6SgqQ6MDQyfcoCLmkae0tbzoRdzcvM9S3HBY3U10HL3lJNnVqHPzCkbteJ2652HKwGNxZxbWP8gHOIKQ==
"@deck.gl/layers@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.8.0.tgz#203646c3b02dcb1d851cba4f4dd73143be130154"
integrity sha512-Ntpf2T5iOxzL9uX9TnOjd9kMw7UyuxGpjMyJv0+S7RxMTQCQn3ezRA5wmz0tEdz0EN7sTntJT5GTAyDnWjgvpg==
dependencies:
"@loaders.gl/images" "^3.2.0"
"@loaders.gl/schema" "^3.2.0"
Expand All @@ -1261,10 +1261,10 @@
"@math.gl/web-mercator" "^3.6.0"
earcut "^2.0.6"

"@deck.gl/mesh-layers@^8.8.0-beta.3":
version "8.8.0-beta.3"
resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.8.0-beta.3.tgz#7338e9120a794c4f9ff2a95f5446d774101cffb7"
integrity sha512-jX2BDuiE8D4Am79E3QqqmEcvtZivvhQDR1qvS3iKPyFB7yCFnxklOclPhts7cOPhi4crgvs32fzF0+cAuTHnpQ==
"@deck.gl/mesh-layers@^8.8.0":
version "8.8.0"
resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.8.0.tgz#0a82c5f536c17dced10fdb767ef2548a2bff4936"
integrity sha512-yAYrUypDQTbv9h13x9948/15YYUoaZ6hSExKhf0boW4MBGnX1roY0Wr+Ly8vjb8GSwTf4Vs1zKzBDHfhcg5Wtw==
dependencies:
"@loaders.gl/gltf" "^3.2.0"
"@luma.gl/constants" "^8.5.14"
Expand Down

0 comments on commit e3a90bc

Please sign in to comment.