Rename ol.layer.ImageLayer to ol.layer.Image

examples/wms-no-proj.js

@@ -4,7 +4,7 @@ goog.require('ol.Projection');
 goog.require('ol.ProjectionUnits');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.source.SingleImageWMS');
 goog.require('ol.source.TiledWMS');
@@ -27,7 +27,7 @@ var layers = [
       url: 'http://wms.geo.admin.ch/'
     })
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       attributions: [new ol.Attribution({
         html: '© ' +

examples/wms-single-image-custom-proj.js

@@ -2,7 +2,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.proj');
 goog.require('ol.source.SingleImageWMS');
 
@@ -14,7 +14,7 @@ var projection = ol.proj.configureProj4jsProjection({
 
 var extent = [420000, 900000, 30000, 350000];
 var layers = [
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
@@ -31,7 +31,7 @@ var layers = [
       extent: extent
     })
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',

examples/wms-single-image.js

@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.SingleImageWMS');
@@ -11,7 +11,7 @@ var layers = [
   new ol.layer.TileLayer({
     source: new ol.source.MapQuestOpenAerial()
   }),
-  new ol.layer.ImageLayer({
+  new ol.layer.Image({
     source: new ol.source.SingleImageWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states'},

src/ol/layer/imagelayer.exports

@@ -1 +1 @@
-@exportClass ol.layer.ImageLayer ol.layer.LayerOptions
+@exportClass ol.layer.Image ol.layer.LayerOptions

src/ol/layer/imagelayer.js

@@ -1,4 +1,4 @@
-goog.provide('ol.layer.ImageLayer');
+goog.provide('ol.layer.Image');
 
 goog.require('ol.layer.Layer');
 goog.require('ol.source.Image');
@@ -10,15 +10,15 @@ goog.require('ol.source.Image');
  * @extends {ol.layer.Layer}
  * @param {ol.layer.LayerOptions} options Layer options.
  */
-ol.layer.ImageLayer = function(options) {
+ol.layer.Image = function(options) {
   goog.base(this, options);
 };
-goog.inherits(ol.layer.ImageLayer, ol.layer.Layer);
+goog.inherits(ol.layer.Image, ol.layer.Layer);
 
 
 /**
  * @return {ol.source.Image} Single image source.
  */
-ol.layer.ImageLayer.prototype.getImageSource = function() {
+ol.layer.Image.prototype.getImageSource = function() {
   return /** @type {ol.source.Image} */ (this.getSource());
 };

src/ol/renderer/canvas/canvasimagelayerrenderer.js

@@ -6,7 +6,7 @@ goog.require('goog.vec.Mat4');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');
 
@@ -16,7 +16,7 @@ goog.require('ol.renderer.canvas.Layer');
  * @constructor
  * @extends {ol.renderer.canvas.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Single image layer.
+ * @param {ol.layer.Image} imageLayer Single image layer.
  */
 ol.renderer.canvas.ImageLayer = function(mapRenderer, imageLayer) {
 
@@ -49,10 +49,10 @@ ol.renderer.canvas.ImageLayer.prototype.getImage = function() {
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Single image layer.
+ * @return {ol.layer.Image} Single image layer.
  */
 ol.renderer.canvas.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -9,7 +9,7 @@ goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Size');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.layer.Vector');
 goog.require('ol.renderer.Map');
@@ -66,7 +66,7 @@ goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
  * @inheritDoc
  */
 ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
-  if (layer instanceof ol.layer.ImageLayer) {
+  if (layer instanceof ol.layer.Image) {
     return new ol.renderer.canvas.ImageLayer(this, layer);
   } else if (layer instanceof ol.layer.TileLayer) {
     return new ol.renderer.canvas.TileLayer(this, layer);

src/ol/renderer/dom/domimagelayerrenderer.js

@@ -9,7 +9,7 @@ goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
 goog.require('ol.dom');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.dom.Layer');
 
 
@@ -18,7 +18,7 @@ goog.require('ol.renderer.dom.Layer');
  * @constructor
  * @extends {ol.renderer.dom.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Image layer.
+ * @param {ol.layer.Image} imageLayer Image layer.
  */
 ol.renderer.dom.ImageLayer = function(mapRenderer, imageLayer) {
   var target = goog.dom.createElement(goog.dom.TagName.DIV);
@@ -45,10 +45,10 @@ goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Image layer.
+ * @return {ol.layer.Image} Image layer.
  */
 ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/dom/dommaprenderer.js

@@ -5,7 +5,7 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.style');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.dom.ImageLayer');
@@ -53,7 +53,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
   var layerRenderer;
   if (layer instanceof ol.layer.TileLayer) {
     layerRenderer = new ol.renderer.dom.TileLayer(this, layer);
-  } else if (layer instanceof ol.layer.ImageLayer) {
+  } else if (layer instanceof ol.layer.Image) {
     layerRenderer = new ol.renderer.dom.ImageLayer(this, layer);
   } else {
     goog.asserts.fail();

src/ol/renderer/webgl/webglimagelayerrenderer.js

@@ -10,7 +10,7 @@ goog.require('ol.Extent');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
 goog.require('ol.ViewHint');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.renderer.webgl.Layer');
 
 
@@ -19,7 +19,7 @@ goog.require('ol.renderer.webgl.Layer');
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.ImageLayer} imageLayer Tile layer.
+ * @param {ol.layer.Image} imageLayer Tile layer.
  */
 ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
 
@@ -73,10 +73,10 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
 
 /**
  * @protected
- * @return {ol.layer.ImageLayer} Tile layer.
+ * @return {ol.layer.Image} Tile layer.
  */
 ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
-  return /** @type {ol.layer.ImageLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Image} */ (this.getLayer());
 };
 
 

src/ol/renderer/webgl/webglmaprenderer.js

@@ -17,7 +17,7 @@ goog.require('ol.FrameState');
 goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.css');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.layer.VectorLayer2');
 goog.require('ol.renderer.Map');
@@ -301,7 +301,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture =
 ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
   if (layer instanceof ol.layer.TileLayer) {
     return new ol.renderer.webgl.TileLayer(this, layer);
-  } else if (layer instanceof ol.layer.ImageLayer) {
+  } else if (layer instanceof ol.layer.Image) {
     return new ol.renderer.webgl.ImageLayer(this, layer);
   } else if (layer instanceof ol.layer.VectorLayer2) {
     return new ol.renderer.webgl.VectorLayer2(this, layer);

test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js

@@ -15,7 +15,7 @@ describe('ol.renderer.webgl.ImageLayer', function() {
       map = new ol.Map({
         target: document.createElement('div')
       });
-      var layer = new ol.layer.ImageLayer({
+      var layer = new ol.layer.Image({
         source: new ol.source.Image({
           extent: [0, 1, 0, 1]
         })
@@ -80,6 +80,6 @@ goog.require('goog.dispose');
 goog.require('goog.vec.Mat4');
 goog.require('goog.vec.Vec4');
 goog.require('ol.Map');
-goog.require('ol.layer.ImageLayer');
+goog.require('ol.layer.Image');
 goog.require('ol.source.Image');
 goog.require('ol.renderer.webgl.ImageLayer');