From 1f5cda88c400bb9490478a98225b8f1e7085fcb2 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 7 Aug 2012 12:07:55 +0200
Subject: [PATCH] Replace ol.Tile.isLoaded with ol.Tile.getState

---
 src/ol/tile/tile.js               | 31 ++++++++++++++++---------------
 src/ol/webgl/tilelayerrenderer.js |  6 ++++--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/ol/tile/tile.js b/src/ol/tile/tile.js
index f326daab8d..216449b6c3 100644
--- a/src/ol/tile/tile.js
+++ b/src/ol/tile/tile.js
@@ -1,4 +1,5 @@
 goog.provide('ol.Tile');
+goog.provide('ol.TileState');
 
 goog.require('goog.array');
 goog.require('goog.events');
@@ -10,7 +11,7 @@ goog.require('ol.TileCoord');
 /**
  * @enum {number}
  */
-ol.TileLoadState = {
+ol.TileState = {
   IDLE: 0,
   LOADING: 1,
   LOADED: 2,
@@ -43,9 +44,9 @@ ol.Tile = function(tileCoord, src, crossOrigin) {
 
   /**
    * @private
-   * @type {ol.TileLoadState}
+   * @type {ol.TileState}
    */
-  this.state_ = ol.TileLoadState.IDLE;
+  this.state_ = ol.TileState.IDLE;
 
   /**
    * @private
@@ -103,11 +104,19 @@ ol.Tile.prototype.getImage = function(opt_context) {
 };
 
 
+/**
+ * @return {ol.TileState} State.
+ */
+ol.Tile.prototype.getState = function() {
+  return this.state_;
+};
+
+
 /**
  * @private
  */
 ol.Tile.prototype.handleImageError_ = function() {
-  this.state_ = ol.TileLoadState.ERROR;
+  this.state_ = ol.TileState.ERROR;
   this.unlistenImage_();
 };
 
@@ -116,25 +125,17 @@ ol.Tile.prototype.handleImageError_ = function() {
  * @private
  */
 ol.Tile.prototype.handleImageLoad_ = function() {
-  this.state_ = ol.TileLoadState.LOADED;
+  this.state_ = ol.TileState.LOADED;
   this.unlistenImage_();
   this.dispatchChangeEvent();
 };
 
 
-/**
- * @return {boolean} Is loaded.
- */
-ol.Tile.prototype.isLoaded = function() {
-  return this.state_ == ol.TileLoadState.LOADED;
-};
-
-
 /**
  */
 ol.Tile.prototype.load = function() {
-  if (this.state_ == ol.TileLoadState.IDLE) {
-    this.state_ = ol.TileLoadState.LOADING;
+  if (this.state_ == ol.TileState.IDLE) {
+    this.state_ = ol.TileState.LOADING;
     goog.asserts.assert(goog.isNull(this.imageListenerKeys_));
     this.imageListenerKeys_ = [
       goog.events.listenOnce(this.image_, goog.events.EventType.ERROR,
diff --git a/src/ol/webgl/tilelayerrenderer.js b/src/ol/webgl/tilelayerrenderer.js
index 6137e833f6..a93ac9f8ce 100644
--- a/src/ol/webgl/tilelayerrenderer.js
+++ b/src/ol/webgl/tilelayerrenderer.js
@@ -16,6 +16,7 @@ goog.require('goog.webgl');
 goog.require('ol.Coordinate');
 goog.require('ol.Size');
 goog.require('ol.TileLayer');
+goog.require('ol.TileState');
 goog.require('ol.webgl.LayerRenderer');
 goog.require('ol.webgl.shader.Fragment');
 goog.require('ol.webgl.shader.Vertex');
@@ -334,7 +335,7 @@ ol.webgl.TileLayerRenderer.prototype.render = function() {
   tileBounds.forEachTileCoord(z, function(tileCoord) {
     var tile = tileStore.getTile(tileCoord);
     if (goog.isNull(tile)) {
-    } else if (tile.isLoaded()) {
+    } else if (tile.getState() == ol.TileState.LOADED) {
       tilesToDrawByZ[z][tileCoord.toString()] = tile;
     } else {
       var tileKey = goog.getUid(tile);
@@ -355,7 +356,8 @@ ol.webgl.TileLayerRenderer.prototype.render = function() {
                 return;
               }
               var tile = tileStore.getTile(tileCoord);
-              if (!goog.isNull(tile) && tile.isLoaded()) {
+              if (!goog.isNull(tile) &&
+                  tile.getState() == ol.TileState.LOADED) {
                 if (!tilesToDrawByZ[z]) {
                   tilesToDrawByZ[z] = {};
                 }