ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_renderer_Type_ to RendererType

Browse Source
This commit is contained in:
Frederic Junod
2017-12-18 16:41:44 +01:00
parent 11f1c693a8
commit 30a9c49bf0
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/PluggableMap.js
View File

@@ -25,7 +25,7 @@ import {TRUE} from './functions.js';
import _ol_has_ from './has.js';
import _ol_layer_Group_ from './layer/Group.js';
import _ol_plugins_ from './plugins.js';
import _ol_renderer_Type_ from './renderer/Type.js';
import RendererType from './renderer/Type.js';
import _ol_size_ from './size.js';
import PriorityQueue from './structs/PriorityQueue.js';
import _ol_transform_ from './transform.js';
@@ -1378,8 +1378,8 @@ _ol_PluggableMap_.prototype.unskipFeature = function(feature) {
* @const
*/
_ol_PluggableMap_.DEFAULT_RENDERER_TYPES = [
_ol_renderer_Type_.CANVAS,
_ol_renderer_Type_.WEBGL
RendererType.CANVAS,
RendererType.WEBGL
];

6
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -11,7 +11,7 @@ import {getHeight, getIntersection, getWidth, isEmpty} from '../../extent.js';
import _ol_layer_VectorRenderType_ from '../../layer/VectorRenderType.js';
import _ol_obj_ from '../../obj.js';
import _ol_plugins_ from '../../plugins.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
import _ol_transform_ from '../../transform.js';
@@ -60,7 +60,7 @@ 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 === _ol_renderer_Type_.CANVAS && (layer.getType() === _ol_LayerType_.IMAGE ||
return type === RendererType.CANVAS && (layer.getType() === _ol_LayerType_.IMAGE ||
layer.getType() === _ol_LayerType_.VECTOR &&
/** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE);
};
@@ -78,7 +78,7 @@ _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) {
var candidates = _ol_plugins_.getLayerRendererPlugins();
for (var i = 0, ii = candidates.length; i < ii; ++i) {
var candidate = /** @type {Object.<string, Function>} */ (candidates[i]);
if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](_ol_renderer_Type_.CANVAS, layer)) {
if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](RendererType.CANVAS, layer)) {
renderer.setVectorRenderer(candidate['create'](mapRenderer, layer));
}
}

6
src/ol/renderer/canvas/Map.js
View File

@@ -14,7 +14,7 @@ import _ol_render_EventType_ from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_source_State_ from '../../source/State.js';
/**
@@ -69,7 +69,7 @@ inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
* @return {boolean} The renderer can render the layer.
*/
_ol_renderer_canvas_Map_['handles'] = function(type) {
return type === _ol_renderer_Type_.CANVAS;
return type === RendererType.CANVAS;
};
@@ -131,7 +131,7 @@ _ol_renderer_canvas_Map_.prototype.getTransform = function(frameState) {
* @inheritDoc
*/
_ol_renderer_canvas_Map_.prototype.getType = function() {
return _ol_renderer_Type_.CANVAS;
return RendererType.CANVAS;
};

4
src/ol/renderer/canvas/TileLayer.js
View File

@@ -8,7 +8,7 @@ import _ol_TileState_ from '../../TileState.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js';
import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../canvas/IntermediateCanvas.js';
import _ol_transform_ from '../../transform.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 === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.TILE;
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.TILE;
};

4
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -12,7 +12,7 @@ import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
import _ol_render_EventType_ from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_Layer_ from '../canvas/Layer.js';
import _ol_renderer_vector_ from '../vector.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 === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.VECTOR;
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR;
};

4
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -16,7 +16,7 @@ import ReplayType from '../../render/ReplayType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
import _ol_render_replay_ from '../../render/replay.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_canvas_TileLayer_ from '../canvas/TileLayer.js';
import _ol_renderer_vector_ from '../vector.js';
import _ol_transform_ from '../../transform.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 === _ol_renderer_Type_.CANVAS && layer.getType() === _ol_LayerType_.VECTOR_TILE;
return type === RendererType.CANVAS && layer.getType() === _ol_LayerType_.VECTOR_TILE;
};

4
src/ol/renderer/webgl/ImageLayer.js
View File

@@ -8,7 +8,7 @@ import _ol_ViewHint_ from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js';
import {getIntersection, isEmpty} from '../../extent.js';
import {TRUE} from '../../functions.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_transform_ from '../../transform.js';
import _ol_webgl_ from '../../webgl.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 === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.IMAGE;
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.IMAGE;
};

6
src/ol/renderer/webgl/Map.js
View File

@@ -13,7 +13,7 @@ import _ol_render_Event_ from '../../render/Event.js';
import _ol_render_EventType_ from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_source_State_ from '../../source/State.js';
import LRUCache from '../../structs/LRUCache.js';
import PriorityQueue from '../../structs/PriorityQueue.js';
@@ -175,7 +175,7 @@ inherits(_ol_renderer_webgl_Map_, _ol_renderer_Map_);
* @return {boolean} The renderer can render the layer.
*/
_ol_renderer_webgl_Map_['handles'] = function(type) {
return _ol_has_.WEBGL && type === _ol_renderer_Type_.WEBGL;
return _ol_has_.WEBGL && type === RendererType.WEBGL;
};
@@ -358,7 +358,7 @@ _ol_renderer_webgl_Map_.prototype.getTileTextureQueue = function() {
* @inheritDoc
*/
_ol_renderer_webgl_Map_.prototype.getType = function() {
return _ol_renderer_Type_.WEBGL;
return RendererType.WEBGL;
};

4
src/ol/renderer/webgl/TileLayer.js
View File

@@ -11,7 +11,7 @@ import _ol_TileState_ from '../../TileState.js';
import _ol_array_ from '../../array.js';
import {createEmpty, intersects} from '../../extent.js';
import _ol_math_ from '../../math.js';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_renderer_webgl_tilelayershader_ from '../webgl/tilelayershader.js';
import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.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 === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.TILE;
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.TILE;
};

4
src/ol/renderer/webgl/VectorLayer.js
View File

@@ -6,7 +6,7 @@ import _ol_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';
import _ol_renderer_Type_ from '../Type.js';
import RendererType from '../Type.js';
import _ol_renderer_vector_ from '../vector.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_transform_ from '../../transform.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 === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.VECTOR;
return type === RendererType.WEBGL && layer.getType() === _ol_LayerType_.VECTOR;
};