diff --git a/src/ol/map.js b/src/ol/map.js index 401129ed38..23996a883b 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -42,6 +42,7 @@ goog.require('ol.ObjectEventType'); goog.require('ol.Pixel'); goog.require('ol.PostRenderFunction'); goog.require('ol.PreRenderFunction'); +goog.require('ol.RendererType'); goog.require('ol.Size'); goog.require('ol.Tile'); goog.require('ol.TileQueue'); @@ -98,18 +99,6 @@ ol.OL3_LOGO_URL = 'data:image/png;base64,' + 'q82CM2MwKeibqAvSO7MCABq0wXEPiqWEAAAAAElFTkSuQmCC'; -/** - * Available renderers: `'canvas'`, `'dom'` or `'webgl'`. - * @enum {string} - * @todo api - */ -ol.RendererType = { - CANVAS: 'canvas', - DOM: 'dom', - WEBGL: 'webgl' -}; - - /** * @type {Array.} */ diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index ad9d509a1d..c262d394e9 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -7,6 +7,7 @@ goog.require('goog.dom'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol'); +goog.require('ol.RendererType'); goog.require('ol.css'); goog.require('ol.dom'); goog.require('ol.layer.Image'); @@ -130,7 +131,7 @@ ol.renderer.canvas.Map.prototype.getCanvasLayerRenderer = function(layer) { * @inheritDoc */ ol.renderer.canvas.Map.prototype.getType = function() { - return 'canvas'; + return ol.RendererType.CANVAS; }; diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index e3d6e7db84..0d2e72b47b 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -6,6 +6,7 @@ goog.require('goog.dom.TagName'); goog.require('goog.functions'); goog.require('goog.style'); goog.require('ol'); +goog.require('ol.RendererType'); goog.require('ol.css'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); @@ -79,7 +80,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) { * @inheritDoc */ ol.renderer.dom.Map.prototype.getType = function() { - return 'dom'; + return ol.RendererType.DOM; }; diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 4024b12fb6..9308533ff1 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -1,3 +1,4 @@ +goog.provide('ol.RendererType'); goog.provide('ol.renderer.Map'); goog.require('goog.Disposable'); @@ -11,6 +12,18 @@ goog.require('ol.style.IconImageCache'); goog.require('ol.vec.Mat4'); +/** + * Available renderers: `'canvas'`, `'dom'` or `'webgl'`. + * @enum {string} + * @todo api + */ +ol.RendererType = { + CANVAS: 'canvas', + DOM: 'dom', + WEBGL: 'webgl' +}; + + /** * @constructor diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 51593cba72..2b8074ee29 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -13,6 +13,7 @@ goog.require('goog.object'); goog.require('goog.style'); goog.require('goog.webgl'); goog.require('ol'); +goog.require('ol.RendererType'); goog.require('ol.Tile'); goog.require('ol.css'); goog.require('ol.dom'); @@ -350,7 +351,7 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() { * @inheritDoc */ ol.renderer.webgl.Map.prototype.getType = function() { - return 'webgl'; + return ol.RendererType.WEBGL; };