From ca5b0c63a582687cd847658c7d503b73b1fd4eb4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 4 Nov 2018 19:54:55 -0700 Subject: [PATCH] Remove LayerType --- src/ol/LayerType.js | 14 -------------- src/ol/layer/Base.js | 15 --------------- src/ol/layer/BaseImage.js | 9 --------- src/ol/layer/BaseTile.js | 8 -------- src/ol/layer/BaseVector.js | 7 ------- src/ol/layer/VectorTile.js | 7 ------- src/ol/renderer/Map.js | 2 +- 7 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 src/ol/LayerType.js diff --git a/src/ol/LayerType.js b/src/ol/LayerType.js deleted file mode 100644 index a51a68121c..0000000000 --- a/src/ol/LayerType.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @module ol/LayerType - */ - -/** - * A layer type used when creating layer renderers. - * @enum {string} - */ -export default { - IMAGE: 'IMAGE', - TILE: 'TILE', - VECTOR_TILE: 'VECTOR_TILE', - VECTOR: 'VECTOR' -}; diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js index f733eb2421..124841f1e9 100644 --- a/src/ol/layer/Base.js +++ b/src/ol/layer/Base.js @@ -65,21 +65,6 @@ class BaseLayer extends BaseObject { */ this.state_ = null; - /** - * The layer type. - * @type {import("../LayerType.js").default} - * @protected; - */ - this.type; - - } - - /** - * Get the layer type (used when creating a layer renderer). - * @return {import("../LayerType.js").default} The layer type. - */ - getType() { - return this.type; } /** diff --git a/src/ol/layer/BaseImage.js b/src/ol/layer/BaseImage.js index 1d02eeadc5..d11edc7efe 100644 --- a/src/ol/layer/BaseImage.js +++ b/src/ol/layer/BaseImage.js @@ -1,7 +1,6 @@ /** * @module ol/layer/BaseImage */ -import LayerType from '../LayerType.js'; import Layer from './Layer.js'; @@ -46,14 +45,6 @@ class BaseImageLayer extends Layer { constructor(opt_options) { const options = opt_options ? opt_options : {}; super(options); - - /** - * The layer type. - * @protected - * @type {import("../LayerType.js").default} - */ - this.type = LayerType.IMAGE; - } } diff --git a/src/ol/layer/BaseTile.js b/src/ol/layer/BaseTile.js index cc9f876093..efeea306a6 100644 --- a/src/ol/layer/BaseTile.js +++ b/src/ol/layer/BaseTile.js @@ -1,7 +1,6 @@ /** * @module ol/layer/BaseTile */ -import LayerType from '../LayerType.js'; import Layer from './Layer.js'; import TileProperty from './TileProperty.js'; import {assign} from '../obj.js'; @@ -59,13 +58,6 @@ class BaseTileLayer extends Layer { this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ? options.useInterimTilesOnError : true); - /** - * The layer type. - * @protected - * @type {import("../LayerType.js").default} - */ - this.type = LayerType.TILE; - } /** diff --git a/src/ol/layer/BaseVector.js b/src/ol/layer/BaseVector.js index 57dc79eb90..6498e00e92 100644 --- a/src/ol/layer/BaseVector.js +++ b/src/ol/layer/BaseVector.js @@ -1,7 +1,6 @@ /** * @module ol/layer/BaseVector */ -import LayerType from '../LayerType.js'; import Layer from './Layer.js'; import {assign} from '../obj.js'; import {createDefaultStyle, toFunction as toStyleFunction} from '../style/Style.js'; @@ -123,12 +122,6 @@ class BaseVectorLayer extends Layer { this.updateWhileInteracting_ = options.updateWhileInteracting !== undefined ? options.updateWhileInteracting : false; - /** - * The layer type. - * @protected - * @type {import("../LayerType.js").default} - */ - this.type = LayerType.VECTOR; } /** diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index 5938b2098e..58d65e5495 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -1,7 +1,6 @@ /** * @module ol/layer/VectorTile */ -import LayerType from '../LayerType.js'; import {assert} from '../asserts.js'; import TileProperty from './TileProperty.js'; import BaseVectorLayer from './BaseVector.js'; @@ -113,12 +112,6 @@ class VectorTileLayer extends BaseVectorLayer { this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ? options.useInterimTilesOnError : true); - /** - * The layer type. - * @protected - * @type {import("../LayerType.js").default} - */ - this.type = LayerType.VECTOR_TILE; } /** diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index 9e3679f7c6..dd8bff7c49 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -206,7 +206,7 @@ class MapRenderer extends Disposable { const renderer = layer.getRenderer(this); if (!renderer) { - throw new Error('Unable to create renderer for layer: ' + layer.getType()); + throw new Error('Unable to create renderer for layer'); } this.layerRenderers_[layerKey] = renderer;