Remove check for map renderer type

This commit is contained in:
Tim Schaub
2018-04-14 10:01:07 -06:00
parent be35f82ae5
commit 91f2101cab
11 changed files with 17 additions and 69 deletions
+2 -4
View File
@@ -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) {
return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE;
WebGLImageLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.IMAGE;
};
-9
View File
@@ -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
+2 -4
View File
@@ -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) {
return type === RendererType.WEBGL && layer.getType() === LayerType.TILE;
WebGLTileLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.TILE;
};
+2 -4
View File
@@ -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) {
return type === RendererType.WEBGL && layer.getType() === LayerType.VECTOR;
WebGLVectorLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.VECTOR;
};