From 3d443646cb03fad96bf9677e6c4e03c696d2012d Mon Sep 17 00:00:00 2001 From: Boris Kotov Date: Thu, 23 Jan 2020 22:17:40 +0100 Subject: [PATCH] Expose loadSprite as style.method --- src/style/style.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/style/style.js b/src/style/style.js index bcd8d1c1ffb..af70614702e 100644 --- a/src/style/style.js +++ b/src/style/style.js @@ -250,20 +250,7 @@ class Style extends Evented { } if (json.sprite) { - this._spriteRequest = loadSprite(json.sprite, this.map._requestManager, (err, images) => { - this._spriteRequest = null; - if (err) { - this.fire(new ErrorEvent(err)); - } else if (images) { - for (const id in images) { - this.imageManager.addImage(id, images[id]); - } - } - - this.imageManager.setLoaded(true); - this.dispatcher.broadcast('setImages', this.imageManager.listImages()); - this.fire(new Event('data', {dataType: 'style'})); - }); + this.loadSprite(json.sprite); } else { this.imageManager.setLoaded(true); } @@ -288,6 +275,23 @@ class Style extends Evented { this.fire(new Event('style.load')); } + loadSprite(url: string) { + this._spriteRequest = loadSprite(url, this.map._requestManager, (err, images) => { + this._spriteRequest = null; + if (err) { + this.fire(new ErrorEvent(err)); + } else if (images) { + for (const id in images) { + this.imageManager.addImage(id, images[id]); + } + } + + this.imageManager.setLoaded(true); + this.dispatcher.broadcast('setImages', this.imageManager.listImages()); + this.fire(new Event('data', {dataType: 'style'})); + }); + } + _validateLayer(layer: StyleLayer) { const sourceCache = this.sourceCaches[layer.source]; if (!sourceCache) {