Merge branch 'master' of github.com:openlayers/ol3 into vector

2013-03-07 23:10:06 -07:00
parent 4918106a22 1f510d893f
commit 4422e3e73b
120 changed files with 16315 additions and 1555 deletions
@@ -158,10 +158,11 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =

      tileState = tile.getState();
      if (tileState == ol.TileState.IDLE) {
-        this.listenToTileChange(tile);
        this.updateWantedTiles(frameState.wantedTiles, tileSource, tileCoord);
        tileCenter = tileGrid.getTileCoordCenter(tileCoord);
        frameState.tileQueue.enqueue(tile, tileSourceKey, tileCenter);
+      } else if (tileState == ol.TileState.LOADING) {
+        this.listenToTileChange(tile);
      } else if (tileState == ol.TileState.LOADED) {
        tilesToDrawByZ[z][tileCoord.toString()] = tile;
        continue;