diff --git a/src/ol/image.js b/src/ol/image.js index 46d2f065c8..904f7bc095 100644 --- a/src/ol/image.js +++ b/src/ol/image.js @@ -66,8 +66,9 @@ goog.inherits(ol.Image, ol.ImageBase); /** * @param {Object=} opt_context Object. * @return {HTMLCanvasElement|Image|HTMLVideoElement} Image. + * @api */ -ol.Image.prototype.getImageElement = function(opt_context) { +ol.Image.prototype.getImage = function(opt_context) { if (goog.isDef(opt_context)) { var image; var key = goog.getUid(opt_context); diff --git a/src/ol/imagebase.js b/src/ol/imagebase.js index 881c93dd53..5e0a464fbb 100644 --- a/src/ol/imagebase.js +++ b/src/ol/imagebase.js @@ -95,7 +95,7 @@ ol.ImageBase.prototype.getExtent = function() { * @param {Object=} opt_context Object. * @return {HTMLCanvasElement|Image|HTMLVideoElement} Image. */ -ol.ImageBase.prototype.getImageElement = goog.abstractMethod; +ol.ImageBase.prototype.getImage = goog.abstractMethod; /** diff --git a/src/ol/imagecanvas.js b/src/ol/imagecanvas.js index 3cd7ac9f2b..6cc9b7295b 100644 --- a/src/ol/imagecanvas.js +++ b/src/ol/imagecanvas.js @@ -33,6 +33,6 @@ goog.inherits(ol.ImageCanvas, ol.ImageBase); /** * @inheritDoc */ -ol.ImageCanvas.prototype.getImageElement = function(opt_context) { +ol.ImageCanvas.prototype.getImage = function(opt_context) { return this.canvas_; }; diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index bfca200597..c223d84f1c 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -69,7 +69,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel = */ ol.renderer.canvas.ImageLayer.prototype.getImage = function() { return goog.isNull(this.image_) ? - null : this.image_.getImageElement(); + null : this.image_.getImage(); }; diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 46242e14db..ce2ca367c7 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -129,7 +129,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = (imageExtent[0] - viewCenter[0]) / imageResolution, (viewCenter[1] - imageExtent[3]) / imageResolution); if (image != this.image_) { - var imageElement = image.getImageElement(this); + var imageElement = image.getImage(this); // Bootstrap sets the style max-width: 100% for all images, which breaks // prevents the image from being displayed in FireFox. Workaround by // overriding the max-width style. diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 7022b626e9..8579d2cc9c 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -48,7 +48,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) { // http://www.khronos.org/webgl/wiki/WebGL_and_OpenGL_Differences#Non-Power_of_Two_Texture_Support // http://learningwebgl.com/blog/?p=2101 - var imageElement = image.getImageElement(); + var imageElement = image.getImage(); var gl = this.getWebGLMapRenderer().getGL(); var texture = gl.createTexture();