Fire data and dataend events

mapbox · Apr 20, 2016 · be2a101 · be2a101
1 parent 78de357
commit be2a101
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 9 deletions.
diff --git a/debug/events.html b/debug/events.html
@@ -189,7 +189,8 @@
  'zoomstart', 'zoom', 'zoomend',
  'rotatestart', 'rotate', 'rotateend',
  'pitchstart', 'pitch', 'pitchend',
- 'boxzoomstart', 'boxzoomend', 'boxzoomcancel'
+ 'boxzoomstart', 'boxzoomend', 'boxzoomcancel',
+ 'dataend', 'data'
 ].forEach(function (type) {
     var name = 'show-' + type;
     var input = document.createElement('input');

diff --git a/js/style/image_sprite.js b/js/style/image_sprite.js
@@ -51,7 +51,7 @@ ImageSprite.prototype.toJSON = function() {
     return this.base;
 };
 
-ImageSprite.prototype.loaded = function() {
+ImageSprite.prototype.isDataStable = function() {
     return !!(this.data && this.img);
 };
 

diff --git a/js/ui/map.js b/js/ui/map.js
@@ -109,10 +109,9 @@ var Map = module.exports = function(options) {
 
     this.on('move', this._update.bind(this, false));
     this.on('zoom', this._update.bind(this, true));
-    this.on('moveend', function() {
-        this.animationLoop.set(300); // text fading
-        this._rerender();
-    }.bind(this));
+    this.on('moveend', this._onMoveend.bind(this));
+    this.on('data', this._onData.bind(this));
+
 
     if (typeof window !== 'undefined') {
         window.addEventListener('resize', this._onWindowResize, false);
@@ -847,9 +846,23 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
 
         this.fire('render');
 
-        if (this.isDataStable() && !this._loaded) {
-            this._loaded = true;
-            this.fire('load');
+        if (this._willFireData) {
+            this.fire('data');
+            this._willFireData = false;
+        }
+
+        if (this.isDataStable()) {
+            if (!this._wasLoaded) {
+                this._wasLoaded = true;
+                this.fire('load');
+            }
+
+            if (!this._wasDataStable) {
+                this._wasDataStable = true;
+                this.fire('dataend');
+            }
+        } else {
+            this._wasDataStable = false;
         }
 
         this._frameId = null;
@@ -906,6 +919,7 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
     },
 
     _forwardStyleEvent: function(e) {
+        if (e.type === 'load' || e.type === 'change') this._willFireData = true;
         this.fire('style.' + e.type, util.extend({style: e.target}, e));
     },
 
@@ -918,6 +932,9 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
     },
 
     _forwardTileEvent: function(e) {
+        if (e.type === 'tile.load' || e.type === 'tile.add') {
+            this._willFireData = true;
+        }
         this.fire(e.type, util.extend({style: e.target}, e));
     },
 
@@ -939,22 +956,34 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
         if (source.onAdd)
             source.onAdd(this);
         this._forwardSourceEvent(e);
+        this._willFireData = true;
     },
 
     _onSourceRemove: function(e) {
         var source = e.source;
         if (source.onRemove)
             source.onRemove(this);
         this._forwardSourceEvent(e);
+        this._willFireData = true;
     },
 
     _onSourceUpdate: function(e) {
         this._update();
         this._forwardSourceEvent(e);
+        this._willFireData = true;
     },
 
     _onWindowResize: function() {
         this.stop().resize()._update();
+    },
+
+    _onMoveend: function() {
+        this.animationLoop.set(300); // text fading
+        this._rerender();
+    },
+
+    _onData: function() {
+        this._wasDataStable = false;
     }
 });