Use assertInstanceof instead of getImageSource
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
goog.provide('ol.layer.Image');
|
goog.provide('ol.layer.Image');
|
||||||
|
|
||||||
goog.require('ol.layer.Layer');
|
goog.require('ol.layer.Layer');
|
||||||
goog.require('ol.source.Image');
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -15,11 +14,3 @@ ol.layer.Image = function(options) {
|
|||||||
goog.base(this, options);
|
goog.base(this, options);
|
||||||
};
|
};
|
||||||
goog.inherits(ol.layer.Image, ol.layer.Layer);
|
goog.inherits(ol.layer.Image, ol.layer.Layer);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return {ol.source.Image} Single image source.
|
|
||||||
*/
|
|
||||||
ol.layer.Image.prototype.getImageSource = function() {
|
|
||||||
return /** @type {ol.source.Image} */ (this.getSource());
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ goog.require('ol.ViewHint');
|
|||||||
goog.require('ol.layer.Image');
|
goog.require('ol.layer.Image');
|
||||||
goog.require('ol.renderer.Map');
|
goog.require('ol.renderer.Map');
|
||||||
goog.require('ol.renderer.canvas.Layer');
|
goog.require('ol.renderer.canvas.Layer');
|
||||||
|
goog.require('ol.source.Image');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -70,7 +71,8 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =
|
|||||||
var image;
|
var image;
|
||||||
var imageLayer = this.getLayer();
|
var imageLayer = this.getLayer();
|
||||||
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
||||||
var imageSource = imageLayer.getImageSource();
|
var imageSource = imageLayer.getSource();
|
||||||
|
goog.asserts.assertInstanceof(imageSource, ol.source.Image);
|
||||||
|
|
||||||
var hints = frameState.viewHints;
|
var hints = frameState.viewHints;
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ goog.require('ol.ViewHint');
|
|||||||
goog.require('ol.dom');
|
goog.require('ol.dom');
|
||||||
goog.require('ol.layer.Image');
|
goog.require('ol.layer.Image');
|
||||||
goog.require('ol.renderer.dom.Layer');
|
goog.require('ol.renderer.dom.Layer');
|
||||||
|
goog.require('ol.source.Image');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -58,7 +59,8 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame =
|
|||||||
var image = this.image_;
|
var image = this.image_;
|
||||||
var imageLayer = this.getLayer();
|
var imageLayer = this.getLayer();
|
||||||
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
||||||
var imageSource = imageLayer.getImageSource();
|
var imageSource = imageLayer.getSource();
|
||||||
|
goog.asserts.assertInstanceof(imageSource, ol.source.Image);
|
||||||
|
|
||||||
var hints = frameState.viewHints;
|
var hints = frameState.viewHints;
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ goog.require('ol.ImageState');
|
|||||||
goog.require('ol.ViewHint');
|
goog.require('ol.ViewHint');
|
||||||
goog.require('ol.layer.Image');
|
goog.require('ol.layer.Image');
|
||||||
goog.require('ol.renderer.webgl.Layer');
|
goog.require('ol.renderer.webgl.Layer');
|
||||||
|
goog.require('ol.source.Image');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -88,7 +89,8 @@ ol.renderer.webgl.ImageLayer.prototype.renderFrame =
|
|||||||
var texture = this.texture;
|
var texture = this.texture;
|
||||||
var imageLayer = this.getLayer();
|
var imageLayer = this.getLayer();
|
||||||
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
goog.asserts.assertInstanceof(imageLayer, ol.layer.Image);
|
||||||
var imageSource = imageLayer.getImageSource();
|
var imageSource = imageLayer.getSource();
|
||||||
|
goog.asserts.assertInstanceof(imageSource, ol.source.Image);
|
||||||
|
|
||||||
var hints = frameState.viewHints;
|
var hints = frameState.viewHints;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user