Wait to start loading source assets until onAdd is called

js/source/geojson_source.js

@@ -70,6 +70,7 @@ class GeoJSONSource extends Evented {
         this.reparseOverscaled = true;
 
         this.dispatcher = dispatcher;
+        this.setEventedParent(eventedParent);
 
         this._data = options.data;
 
@@ -98,8 +99,9 @@ class GeoJSONSource extends Evented {
                 log: false
             }
         }, options.workerOptions);
+    }
 
-        this.setEventedParent(eventedParent);
+    load() {
         this.fire('dataloading', {dataType: 'source'});
         this._updateWorkerData((err) => {
             if (err) {
@@ -112,6 +114,7 @@ class GeoJSONSource extends Evented {
     }
 
     onAdd(map) {
+        this.load();
         this.map = map;
     }
 

js/source/image_source.js

@@ -55,15 +55,16 @@ class ImageSource extends Evented {
         this.tileSize = 512;
 
         this.setEventedParent(eventedParent);
-        this.fire('dataloading', {dataType: 'source'});
 
-        this._load(options);
+        this.options = options;
     }
 
-    _load(options) {
-        this.url = options.url;
+    load() {
+        this.fire('dataloading', {dataType: 'source'});
+
+        this.url = this.options.url;
 
-        ajax.getImage(options.url, (err, image) => {
+        ajax.getImage(this.options.url, (err, image) => {
             if (err) return this.fire('error', {error: err});
 
             this.image = image;
@@ -81,6 +82,7 @@ class ImageSource extends Evented {
     }
 
     onAdd(map) {
+        this.load();
         this.map = map;
         if (this.image) {
             this.setCoordinates(this.coordinates);

js/source/raster_tile_source.js

@@ -12,18 +12,21 @@ class RasterTileSource extends Evented {
         super();
         this.id = id;
         this.dispatcher = dispatcher;
+        this.setEventedParent(eventedParent);
 
         this.minzoom = 0;
         this.maxzoom = 22;
         this.roundZoom = true;
         this.scheme = 'xyz';
         this.tileSize = 512;
         this._loaded = false;
+        this.options = options;
         util.extend(this, util.pick(options, ['url', 'scheme', 'tileSize']));
+    }
 
-        this.setEventedParent(eventedParent);
+    load() {
         this.fire('dataloading', {dataType: 'source'});
-        loadTileJSON(options, (err, tileJSON) => {
+        loadTileJSON(this.options, (err, tileJSON) => {
             if (err) {
                 return this.fire('error', err);
             }
@@ -34,6 +37,7 @@ class RasterTileSource extends Evented {
     }
 
     onAdd(map) {
+        this.load();
         this.map = map;
     }
 

js/source/source.js

@@ -21,7 +21,6 @@ const sourceTypes = {
  */
 exports.create = function(id, source, dispatcher, eventedParent) {
     source = new sourceTypes[source.type](id, source, dispatcher, eventedParent);
-    source.setEventedParent(eventedParent);
 
     if (source.id !== id) {
         throw new Error(`Expected Source id to be ${id} instead of ${source.id}`);

js/source/source_cache.js

@@ -27,10 +27,7 @@ class SourceCache extends Evented {
         this.id = id;
         this.dispatcher = dispatcher;
 
-        this._source = Source.create(id, options, dispatcher, this);
-
         this.on('source.load', function() {
-            if (this.map && this._source.onAdd) { this._source.onAdd(this.map); }
             this._sourceLoaded = true;
         });
 
@@ -47,6 +44,8 @@ class SourceCache extends Evented {
             }
         });
 
+        this._source = Source.create(id, options, dispatcher, this);
+
         this._tiles = {};
         this._cache = new Cache(0, this.unloadTile.bind(this));
 

js/source/vector_tile_source.js

@@ -28,9 +28,12 @@ class VectorTileSource extends Evented {
         }
 
         this.setEventedParent(eventedParent);
+    }
+
+    load() {
         this.fire('dataloading', {dataType: 'source'});
 
-        loadTileJSON(options, (err, tileJSON) => {
+        loadTileJSON(this._options, (err, tileJSON) => {
             if (err) {
                 this.fire('error', err);
                 return;
@@ -42,6 +45,7 @@ class VectorTileSource extends Evented {
     }
 
     onAdd(map) {
+        this.load();
         this.map = map;
     }
 

js/source/video_source.js

@@ -39,9 +39,11 @@ class VideoSource extends ImageSource {
     constructor(id, options, dispatcher, eventedParent) {
         super(id, options, dispatcher, eventedParent);
         this.roundZoom = true;
+        this.options = options;
     }
 
-    _load(options) {
+    load() {
+        const options = this.options;
         this.urls = options.urls;
 
         ajax.getVideo(options.urls, (err, video) => {
@@ -82,6 +84,7 @@ class VideoSource extends ImageSource {
 
     onAdd(map) {
         if (this.map) return;
+        this.load();
         this.map = map;
         if (this.video) {
             this.video.play();

js/style/image_sprite.js

@@ -18,10 +18,11 @@ class SpritePosition {
 
 class ImageSprite extends Evented {
 
-    constructor(base) {
+    constructor(base, eventedParent) {
         super();
         this.base = base;
         this.retina = browser.devicePixelRatio > 1;
+        this.setEventedParent(eventedParent);
 
         const format = this.retina ? '@2x' : '';
 

js/style/style.js

@@ -94,8 +94,7 @@ class Style extends Evented {
             }
 
             if (stylesheet.sprite) {
-                this.sprite = new ImageSprite(stylesheet.sprite);
-                this.sprite.setEventedParent(this);
+                this.sprite = new ImageSprite(stylesheet.sprite, this);
             }
 
             this.glyphSource = new GlyphSource(stylesheet.glyphs);

test/js/source/geojson_source.test.js

@@ -66,6 +66,7 @@ test('GeoJSONSource#setData', (t) => {
             source.on('data', t.end);
             source.setData({});
         });
+        source.load();
     });
 
     t.test('fires "dataloading" event', (t) => {
@@ -74,6 +75,7 @@ test('GeoJSONSource#setData', (t) => {
             source.on('dataloading', t.end);
             source.setData({});
         });
+        source.load();
     });
 
     t.end();
@@ -115,7 +117,7 @@ test('GeoJSONSource#update', (t) => {
         };
 
         /* eslint-disable no-new */
-        new GeoJSONSource('id', {data: {}}, mockDispatcher);
+        new GeoJSONSource('id', {data: {}}, mockDispatcher).load();
     });
 
     t.test('forwards geojson-vt options with worker request', (t) => {
@@ -137,7 +139,7 @@ test('GeoJSONSource#update', (t) => {
             maxzoom: 10,
             tolerance: 0.25,
             buffer: 16
-        }, mockDispatcher);
+        }, mockDispatcher).load();
     });
 
     t.test('fires "source.load"', (t) => {
@@ -152,6 +154,8 @@ test('GeoJSONSource#update', (t) => {
         source.on('source.load', () => {
             t.end();
         });
+
+        source.load();
     });
 
     t.test('fires "error"', (t) => {
@@ -167,6 +171,8 @@ test('GeoJSONSource#update', (t) => {
             t.equal(err.error, 'error');
             t.end();
         });
+
+        source.load();
     });
 
     t.test('sends loadData request to dispatcher after data update', (t) => {
@@ -189,6 +195,8 @@ test('GeoJSONSource#update', (t) => {
             source.setData({});
             source.loadTile(new Tile(new TileCoord(0, 0, 0), 512), () => {});
         });
+
+        source.load();
     });
 
     t.end();
@@ -198,6 +206,7 @@ test('GeoJSONSource#serialize', (t) => {
 
     t.test('serialize source with inline data', (t) => {
         const source = new GeoJSONSource('id', {data: hawkHill}, mockDispatcher);
+        source.load();
         t.deepEqual(source.serialize(), {
             type: 'geojson',
             data: hawkHill
@@ -207,6 +216,7 @@ test('GeoJSONSource#serialize', (t) => {
 
     t.test('serialize source with url', (t) => {
         const source = new GeoJSONSource('id', {data: 'local://data.json'}, mockDispatcher);
+        source.load();
         t.deepEqual(source.serialize(), {
             type: 'geojson',
             data: 'local://data.json'
@@ -216,6 +226,7 @@ test('GeoJSONSource#serialize', (t) => {
 
     t.test('serialize source with updated data', (t) => {
         const source = new GeoJSONSource('id', {data: {}}, mockDispatcher);
+        source.load();
         source.setData(hawkHill);
         t.deepEqual(source.serialize(), {
             type: 'geojson',