Skip to content

Commit

Permalink
Merge pull request #120 from carbonplan/katamartin/camera-initialization
Browse files Browse the repository at this point in the history
Wait for camera initialization before carrying out `queryRegion`
  • Loading branch information
katamartin authored Jun 17, 2024
2 parents 0f2efbe + e9f3bc3 commit d650aeb
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/tiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ export const createTiles = (regl, opts) => {

customUniforms.forEach((k) => (uniforms[k] = regl.this(k)))

this.cameraInitialized = new Promise((resolve) => {
let shouldResolve = true
this._resolveCameraInitialized = () => {
if (shouldResolve) {
resolve()
shouldResolve = false
}
}
})
this.initialized = new Promise((resolve) => {
const loadingID = this.setLoading('metadata')
initializeStore(source, version, variable, Object.keys(selector)).then(
Expand Down Expand Up @@ -336,6 +345,8 @@ export const createTiles = (regl, opts) => {
projection: this.projection,
})

this._resolveCameraInitialized()

if (this.size && Object.keys(this.active).length === 0) {
this.clearLoading(null, { forceClear: true })
}
Expand Down Expand Up @@ -404,7 +415,7 @@ export const createTiles = (regl, opts) => {
}

this.queryRegion = async (region, selector) => {
await this.initialized
await Promise.all([this.initialized, this.cameraInitialized])

const tiles = getTilesOfRegion(
region,
Expand Down

0 comments on commit d650aeb

Please sign in to comment.