fix unit tests 🔧

src/source/geojson_source.js

@@ -126,13 +126,13 @@ class GeoJSONSource extends Evented {
      */
     setData(data) {
         this._data = data;
-
         this.fire('dataloading', {dataType: 'source'});
         this._updateWorkerData((err) => {
             if (err) {
                 return this.fire('error', { error: err });
             }
             this.fire('source.update');
+            this.fire('data', {dataType: 'source'});
         });
 
         return this;

src/source/source_cache.js

@@ -417,17 +417,17 @@ class SourceCache extends Evented {
                 }
             }
         }
-
-        if (!tile) {
+        const cached = Boolean(tile);
+        if (!cached) {
             const zoom = coord.z;
             const overscaling = zoom > this._source.maxzoom ? Math.pow(2, zoom - this._source.maxzoom) : 1;
             tile = new Tile(wrapped, this._source.tileSize * overscaling, this._source.maxzoom);
-            this._source.fire('dataloading', {tile: tile, coord: tile.coord, dataType: 'tile'});
             this.loadTile(tile, this._tileLoaded.bind(this, tile, coord.id));
         }
 
         tile.uses++;
         this._tiles[coord.id] = tile;
+        if (!cached) this._source.fire('dataloading', {tile: tile, coord: tile.coord, dataType: 'tile'});
 
         return tile;
     }

src/source/vector_tile_source.js

@@ -39,7 +39,6 @@ class VectorTileSource extends Evented {
                 return;
             }
             util.extend(this, tileJSON);
-
             this.fire('source.load');
             this.fire('source.update');
         });

src/ui/control/attribution_control.js

@@ -44,7 +44,7 @@ class AttributionControl {
         this._updateAttributions();
         this._updateEditLink();
 
-        this._map.on('data', this._updateData);
+        this._map.on('source.load', this._updateData);
         this._map.on('moveend', this._updateEditLink);
 
         if (compact === undefined) {
@@ -58,7 +58,7 @@ class AttributionControl {
     onRemove() {
         this._container.parentNode.removeChild(this._container);
 
-        this._map.off('data', this._updateData);
+        this._map.off('source.load', this._updateData);
         this._map.off('moveend', this._updateEditLink);
         this._map.off('resize', this._updateCompact);
 
@@ -75,10 +75,8 @@ class AttributionControl {
     }
 
     _updateData(event) {
-        if (event.dataType === 'source') {
-            this._updateAttributions();
-            this._updateEditLink();
-        }
+        this._updateAttributions();
+        this._updateEditLink();
     }
 
     _updateAttributions() {

src/ui/control/logo_control.js

@@ -22,14 +22,14 @@ class LogoControl {
         this._map = map;
         this._container = DOM.create('div', 'mapboxgl-ctrl');
 
-        this._map.on('data', this._updateLogo);
+        this._map.on('source.load', this._updateLogo);
         this._updateLogo();
         return this._container;
     }
 
     onRemove() {
         this._container.parentNode.removeChild(this._container);
-        this._map.off('data', this._updateLogo);
+        this._map.off('source.load', this._updateLogo);
     }
 
     getDefaultPosition() {

test/unit/source/source_cache.test.js

@@ -112,7 +112,7 @@ test('SourceCache#addTile', (t) => {
         sourceCache.addTile(coord);
 
         t.equal(load, 1);
-        t.equal(add, 2);
+        t.equal(add, 1);
 
         t.end();
     });
@@ -181,7 +181,7 @@ test('SourceCache#addTile', (t) => {
         const t2 = sourceCache.addTile(new TileCoord(0, 0, 0, 1));
 
         t.equal(load, 1);
-        t.equal(add, 2);
+        t.equal(add, 1);
         t.equal(t1, t2);
 
         t.end();
@@ -291,7 +291,7 @@ test('SourceCache / Source lifecycle', (t) => {
         sourceCache.onAdd();
     });
 
-    t.test('reloads tiles after a "source" data event', (t) => {
+    t.test('reloads tiles after a "source.update" event', (t) => {
         const transform = new Transform();
         transform.resize(511, 511);
         transform.zoom = 0;
@@ -309,7 +309,7 @@ test('SourceCache / Source lifecycle', (t) => {
 
         sourceCache.on('source.load', () => {
             sourceCache.update(transform);
-            sourceCache.getSource().fire('data', {dataType: 'source'});
+            sourceCache.getSource().fire('source.update');
         });
 
         sourceCache.onAdd();

test/unit/source/vector_tile_source.test.js

@@ -63,10 +63,10 @@ test('VectorTileSource', (t) => {
         window.server.respond();
     });
 
-    t.test('fires "data" event', (t) => {
+    t.test('fires "source.update" event', (t) => {
         window.server.respondWith('/source.json', JSON.stringify(require('../../fixtures/source')));
         const source = createSource({ url: "/source.json" });
-        source.on('data', t.end);
+        source.on('source.update', t.end);
         window.server.respond();
     });
 
@@ -78,7 +78,7 @@ test('VectorTileSource', (t) => {
             dataloadingFired = true;
         });
         const source = createSource({ url: "/source.json", eventedParent: evented });
-        source.on('data', () => {
+        source.on('source.load', () => {
             if (!dataloadingFired) t.fail();
             t.end();
         });

test/unit/ui/control/attribution.test.js

@@ -89,8 +89,8 @@ test('AttributionControl dedupes attributions that are substrings of others', (t
     });
 
     let times = 0;
-    map.on('data', (event) => {
-        if (event.dataType === 'source' && ++times === 5) {
+    map.on('source.load', () => {
+        if (++times === 5) {
             t.equal(attribution._container.innerHTML, 'Hello World | Another Source');
             t.end();
         }
@@ -104,13 +104,11 @@ test('AttributionControl has the correct edit map link', (t) => {
 
     map.on('load', () => {
         map.addSource('1', {type: 'vector', attribution: '<a class="mapbox-improve-map" href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>'});
-        map.on('data', (event) => {
-            if (event.dataType === 'source') {
-                t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/1', 'edit link contains map location data');
-                map.setZoom(2);
-                t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/3', 'edit link updates on mapmove');
-                t.end();
-            }
+        map.on('source.load', () => {
+            t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/1', 'edit link contains map location data');
+            map.setZoom(2);
+            t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/3', 'edit link updates on mapmove');
+            t.end();
         });
     });
 });