diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js index ca262f1d70..81518b2cc2 100644 --- a/src/ol/layer/Image.js +++ b/src/ol/layer/Image.js @@ -2,7 +2,7 @@ * @module ol/layer/Image */ import {inherits} from '../index.js'; -import _ol_LayerType_ from '../LayerType.js'; +import LayerType from '../LayerType.js'; import _ol_layer_Layer_ from '../layer/Layer.js'; /** @@ -28,7 +28,7 @@ var _ol_layer_Image_ = function(opt_options) { * @protected * @type {ol.LayerType} */ - this.type = _ol_LayerType_.IMAGE; + this.type = LayerType.IMAGE; }; diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js index 4f788d2a9b..97d43d2c95 100644 --- a/src/ol/layer/Tile.js +++ b/src/ol/layer/Tile.js @@ -2,7 +2,7 @@ * @module ol/layer/Tile */ import {inherits} from '../index.js'; -import _ol_LayerType_ from '../LayerType.js'; +import LayerType from '../LayerType.js'; import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_layer_TileProperty_ from '../layer/TileProperty.js'; import _ol_obj_ from '../obj.js'; @@ -39,7 +39,7 @@ var _ol_layer_Tile_ = function(opt_options) { * @protected * @type {ol.LayerType} */ - this.type = _ol_LayerType_.TILE; + this.type = LayerType.TILE; }; diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js index 1a8b03b55d..0af05ea274 100644 --- a/src/ol/layer/Vector.js +++ b/src/ol/layer/Vector.js @@ -2,7 +2,7 @@ * @module ol/layer/Vector */ import {inherits} from '../index.js'; -import _ol_LayerType_ from '../LayerType.js'; +import LayerType from '../LayerType.js'; import _ol_layer_Layer_ from '../layer/Layer.js'; import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js'; import _ol_obj_ from '../obj.js'; @@ -97,7 +97,7 @@ var _ol_layer_Vector_ = function(opt_options) { * @protected * @type {ol.LayerType} */ - this.type = _ol_LayerType_.VECTOR; + this.type = LayerType.VECTOR; }; diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index 828d5b7e3b..65f8fe67e5 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -2,7 +2,7 @@ * @module ol/layer/VectorTile */ import {inherits} from '../index.js'; -import _ol_LayerType_ from '../LayerType.js'; +import LayerType from '../LayerType.js'; import {assert} from '../asserts.js'; import _ol_layer_TileProperty_ from '../layer/TileProperty.js'; import _ol_layer_Vector_ from '../layer/Vector.js'; @@ -50,7 +50,7 @@ var _ol_layer_VectorTile_ = function(opt_options) { * @protected * @type {ol.LayerType} */ - this.type = _ol_LayerType_.VECTOR_TILE; + this.type = LayerType.VECTOR_TILE; }; diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 56bc3d1a02..f3ef59a5eb 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -4,7 +4,7 @@ import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {inherits} from '../../index.js'; import _ol_ImageCanvas_ from '../../ImageCanvas.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import _ol_array_ from '../../array.js'; import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js'; @@ -60,8 +60,8 @@ inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas * @return {boolean} The renderer can render the layer. */ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) { - return type === RendererType.CANVAS && (layer.getType() === _ol_LayerType_.IMAGE || - layer.getType() === _ol_LayerType_.VECTOR && + return type === RendererType.CANVAS && (layer.getType() === LayerType.IMAGE || + layer.getType() === LayerType.VECTOR && /** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE); }; @@ -74,7 +74,7 @@ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) { */ _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) { var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer)); - if (layer.getType() === _ol_LayerType_.VECTOR) { + if (layer.getType() === LayerType.VECTOR) { var candidates = _ol_plugins_.getLayerRendererPlugins(); for (var i = 0, ii = candidates.length; i < ii; ++i) { var candidate = /** @type {Object.} */ (candidates[i]); diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 8492627245..307bff2fa0 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/TileLayer */ import {getUid, inherits} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import TileRange from '../../TileRange.js'; import _ol_TileState_ from '../../TileState.js'; import _ol_ViewHint_ from '../../ViewHint.js'; @@ -88,7 +88,7 @@ inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_ * @return {boolean} The renderer can render the layer. */ _ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) { - return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.TILE; + return type === RendererType.CANVAS && layer.getType() === LayerType.TILE; }; diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 09f10a74ab..5c00518213 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/VectorLayer */ import {getUid, inherits} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import _ol_events_ from '../../events.js'; @@ -93,7 +93,7 @@ inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_); * @return {boolean} The renderer can render the layer. */ _ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) { - return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR; + return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR; }; diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 95e7b0d22d..876e7d4330 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/VectorTileLayer */ import {getUid, inherits} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import _ol_TileState_ from '../../TileState.js'; import {createCanvasContext2D} from '../../dom.js'; import _ol_events_ from '../../events.js'; @@ -78,7 +78,7 @@ inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_); * @return {boolean} The renderer can render the layer. */ _ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) { - return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR_TILE; + return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR_TILE; }; diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index e9bb2dd123..59512f6193 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -3,7 +3,7 @@ */ import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {inherits, nullFunction} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import {getIntersection, isEmpty} from '../../extent.js'; @@ -56,7 +56,7 @@ inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_); * @return {boolean} The renderer can render the layer. */ _ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) { - return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.IMAGE; + return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE; }; diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 2d5a7b59b6..9f0736d43d 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -5,7 +5,7 @@ // FIXME animated shaders! check in redraw import {inherits} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import TileRange from '../../TileRange.js'; import _ol_TileState_ from '../../TileState.js'; import _ol_array_ from '../../array.js'; @@ -96,7 +96,7 @@ inherits(_ol_renderer_webgl_TileLayer_, _ol_renderer_webgl_Layer_); * @return {boolean} The renderer can render the layer. */ _ol_renderer_webgl_TileLayer_['handles'] = function(type, layer) { - return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.TILE; + return type === RendererType.WEBGL && layer.getType() === LayerType.TILE; }; diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index 09ae3c1d32..cf6c6541e5 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/webgl/VectorLayer */ import {getUid, inherits} from '../../index.js'; -import _ol_LayerType_ from '../../LayerType.js'; +import LayerType from '../../LayerType.js'; import _ol_ViewHint_ from '../../ViewHint.js'; import {buffer, containsExtent, createEmpty} from '../../extent.js'; import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js'; @@ -77,7 +77,7 @@ inherits(_ol_renderer_webgl_VectorLayer_, _ol_renderer_webgl_Layer_); * @return {boolean} The renderer can render the layer. */ _ol_renderer_webgl_VectorLayer_['handles'] = function(type, layer) { - return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.VECTOR; + return type === RendererType.WEBGL && layer.getType() === LayerType.VECTOR; };