Use assertInstanceof instead of getTileSource

This commit is contained in:
Tom Payne
2013-12-13 17:10:13 +01:00
parent 8d5e46622c
commit e11d8bf717
4 changed files with 9 additions and 12 deletions

View File

@@ -1,7 +1,6 @@
goog.provide('ol.layer.Tile');
goog.require('ol.layer.Layer');
goog.require('ol.source.Tile');
/**
@@ -44,14 +43,6 @@ goog.exportProperty(
ol.layer.Tile.prototype.getPreload);
/**
* @return {ol.source.Tile} Source.
*/
ol.layer.Tile.prototype.getTileSource = function() {
return /** @type {ol.source.Tile} */ (this.getSource());
};
/**
* @param {number} preload Preload.
* @todo stability experimental

View File

@@ -18,6 +18,7 @@ goog.require('ol.extent');
goog.require('ol.layer.Tile');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.source.Tile');
@@ -167,7 +168,8 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getTileSource();
var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid();
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);

View File

@@ -20,6 +20,7 @@ goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.layer.Tile');
goog.require('ol.renderer.dom.Layer');
goog.require('ol.source.Tile');
goog.require('ol.tilegrid.TileGrid');
@@ -84,7 +85,8 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getTileSource();
var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid();
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);

View File

@@ -17,6 +17,7 @@ goog.require('ol.layer.Tile');
goog.require('ol.math');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.renderer.webgl.tilelayer.shader');
goog.require('ol.source.Tile');
goog.require('ol.structs.Buffer');
@@ -116,7 +117,8 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
var tileLayer = this.getLayer();
goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
var tileSource = tileLayer.getTileSource();
var tileSource = tileLayer.getSource();
goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
var tileGrid = tileSource.getTileGrid();
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);