Remove check for map renderer type

src/ol/renderer/Map.js

@@ -204,10 +204,9 @@ MapRenderer.prototype.getLayerRenderer = function(layer) {
   } else {
     const layerRendererPlugins = getLayerRendererPlugins();
     let renderer;
-    const type = this.getType();
     for (let i = 0, ii = layerRendererPlugins.length; i < ii; ++i) {
       const plugin = layerRendererPlugins[i];
-      if (plugin['handles'](type, layer)) {
+      if (plugin['handles'](layer)) {
         renderer = plugin['create'](this, layer);
         break;
       }
@@ -251,13 +250,6 @@ MapRenderer.prototype.getMap = function() {
 };
 
 
-/**
- * @abstract
- * @return {ol.renderer.Type} Type
- */
-MapRenderer.prototype.getType = function() {};
-
-
 /**
  * Handle changes in a layer renderer.
  * @private

src/ol/renderer/Type.js

@@ -1,12 +0,0 @@
-/**
- * @module ol/renderer/Type
- */
-
-/**
- * Available renderers: `'canvas'` or `'webgl'`.
- * @enum {string}
- */
-export default {
-  CANVAS: 'canvas',
-  WEBGL: 'webgl'
-};

src/ol/renderer/canvas/ImageLayer.js

@@ -11,7 +11,6 @@ import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
 import VectorRenderType from '../../layer/VectorRenderType.js';
 import {assign} from '../../obj.js';
 import {getLayerRendererPlugins} from '../../plugins.js';
-import RendererType from '../Type.js';
 import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
 import {create as createTransform, compose as composeTransform} from '../../transform.js';
 
@@ -55,14 +54,13 @@ inherits(CanvasImageLayerRenderer, IntermediateCanvasRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-CanvasImageLayerRenderer['handles'] = function(type, layer) {
+CanvasImageLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.CANVAS && (layer.getType() === LayerType.IMAGE ||
+  return layer.getType() === LayerType.IMAGE ||
     layer.getType() === LayerType.VECTOR &&
-    /** @type {module:ol/layer/Vector~VectorLayer} */ (layer).getRenderMode() === VectorRenderType.IMAGE);
+    /** @type {module:ol/layer/Vector~VectorLayer} */ (layer).getRenderMode() === VectorRenderType.IMAGE;
 };
 
 
@@ -78,7 +76,7 @@ CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) {
     const candidates = getLayerRendererPlugins();
     for (let i = 0, ii = candidates.length; i < ii; ++i) {
       const candidate = /** @type {Object.<string, Function>} */ (candidates[i]);
-      if (candidate !== CanvasImageLayerRenderer && candidate['handles'](RendererType.CANVAS, layer)) {
+      if (candidate !== CanvasImageLayerRenderer && candidate['handles'](layer)) {
         renderer.setVectorRenderer(candidate['create'](mapRenderer, layer));
         break;
       }

src/ol/renderer/canvas/Map.js

@@ -12,7 +12,6 @@ import RenderEventType from '../../render/EventType.js';
 import {rotateAtOffset} from '../../render/canvas.js';
 import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
 import MapRenderer, {sortByZIndex} from '../Map.js';
-import RendererType from '../Type.js';
 import SourceState from '../../source/State.js';
 
 /**
@@ -104,14 +103,6 @@ CanvasMapRenderer.prototype.getTransform = function(frameState) {
 };
 
 
-/**
- * @inheritDoc
- */
-CanvasMapRenderer.prototype.getType = function() {
-  return RendererType.CANVAS;
-};
-
-
 /**
  * @inheritDoc
  */

src/ol/renderer/canvas/TileLayer.js

@@ -8,7 +8,6 @@ import TileState from '../../TileState.js';
 import ViewHint from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js';
-import RendererType from '../Type.js';
 import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js';
 import {create as createTransform, compose as composeTransform} from '../../transform.js';
 
@@ -83,12 +82,11 @@ inherits(CanvasTileLayerRenderer, IntermediateCanvasRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-CanvasTileLayerRenderer['handles'] = function(type, layer) {
+CanvasTileLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.CANVAS && layer.getType() === LayerType.TILE;
+  return layer.getType() === LayerType.TILE;
 };
 
 

src/ol/renderer/canvas/VectorLayer.js

@@ -12,7 +12,6 @@ import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
 import RenderEventType from '../../render/EventType.js';
 import {labelCache, rotateAtOffset} from '../../render/canvas.js';
 import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
-import RendererType from '../Type.js';
 import CanvasLayerRenderer from '../canvas/Layer.js';
 import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
 
@@ -88,12 +87,11 @@ inherits(CanvasVectorLayerRenderer, CanvasLayerRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-CanvasVectorLayerRenderer['handles'] = function(type, layer) {
+CanvasVectorLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR;
+  return layer.getType() === LayerType.VECTOR;
 };
 
 

src/ol/renderer/canvas/VectorTileLayer.js

@@ -16,7 +16,6 @@ import ReplayType from '../../render/ReplayType.js';
 import {labelCache, rotateAtOffset} from '../../render/canvas.js';
 import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/ReplayGroup.js';
 import {ORDER} from '../../render/replay.js';
-import RendererType from '../Type.js';
 import CanvasTileLayerRenderer from '../canvas/TileLayer.js';
 import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
 import {
@@ -99,12 +98,11 @@ inherits(CanvasVectorTileLayerRenderer, CanvasTileLayerRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-CanvasVectorTileLayerRenderer['handles'] = function(type, layer) {
+CanvasVectorTileLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR_TILE;
+  return layer.getType() === LayerType.VECTOR_TILE;
 };
 
 

src/ol/renderer/webgl/ImageLayer.js

@@ -8,7 +8,6 @@ import LayerType from '../../LayerType.js';
 import ViewHint from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {getIntersection, isEmpty} from '../../extent.js';
-import RendererType from '../Type.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
 import {
   create as createTransform,
@@ -60,12 +59,11 @@ inherits(WebGLImageLayerRenderer, WebGLLayerRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-WebGLImageLayerRenderer['handles'] = function(type, layer) {
+WebGLImageLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE;
+  return layer.getType() === LayerType.IMAGE;
 };
 
 

src/ol/renderer/webgl/Map.js

@@ -12,7 +12,6 @@ import RenderEvent from '../../render/Event.js';
 import RenderEventType from '../../render/EventType.js';
 import WebGLImmediateRenderer from '../../render/webgl/Immediate.js';
 import MapRenderer, {sortByZIndex} from '../Map.js';
-import RendererType from '../Type.js';
 import SourceState from '../../source/State.js';
 import LRUCache from '../../structs/LRUCache.js';
 import PriorityQueue from '../../structs/PriorityQueue.js';
@@ -345,14 +344,6 @@ WebGLMapRenderer.prototype.getTileTextureQueue = function() {
 };
 
 
-/**
- * @inheritDoc
- */
-WebGLMapRenderer.prototype.getType = function() {
-  return RendererType.WEBGL;
-};
-
-
 /**
  * @param {module:ol/events/Event~Event} event Event.
  * @protected

src/ol/renderer/webgl/TileLayer.js

@@ -11,7 +11,6 @@ import TileState from '../../TileState.js';
 import {numberSafeCompareFunction} from '../../array.js';
 import {createEmpty, intersects} from '../../extent.js';
 import {roundUpToPowerOfTwo} from '../../math.js';
-import RendererType from '../Type.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
 import {fragment, vertex} from '../webgl/tilelayershader.js';
 import Locations from '../webgl/tilelayershader/Locations.js';
@@ -97,12 +96,11 @@ inherits(WebGLTileLayerRenderer, WebGLLayerRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-WebGLTileLayerRenderer['handles'] = function(type, layer) {
+WebGLTileLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.WEBGL && layer.getType() === LayerType.TILE;
+  return layer.getType() === LayerType.TILE;
 };
 
 

src/ol/renderer/webgl/VectorLayer.js

@@ -6,7 +6,6 @@ import LayerType from '../../LayerType.js';
 import ViewHint from '../../ViewHint.js';
 import {buffer, containsExtent, createEmpty} from '../../extent.js';
 import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js';
-import RendererType from '../Type.js';
 import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
 import WebGLLayerRenderer from '../webgl/Layer.js';
 import {apply as applyTransform} from '../../transform.js';
@@ -72,12 +71,11 @@ inherits(WebGLVectorLayerRenderer, WebGLLayerRenderer);
 
 /**
  * Determine if this renderer handles the provided layer.
- * @param {ol.renderer.Type} type The renderer type.
  * @param {module:ol/layer/Layer~Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-WebGLVectorLayerRenderer['handles'] = function(type, layer) {
+WebGLVectorLayerRenderer['handles'] = function(layer) {
-  return type === RendererType.WEBGL && layer.getType() === LayerType.VECTOR;
+  return layer.getType() === LayerType.VECTOR;
 };