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

Rename _ol_source_State_ to SourceState

Browse Source
This commit is contained in:
Frederic Junod
2017-12-19 08:33:14 +01:00
parent 003c7bb209
commit d0728a5e65
12 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/renderer/Layer.js
View File

@@ -8,7 +8,7 @@ import _ol_TileState_ from '../TileState.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {FALSE} from '../functions.js';
import _ol_source_State_ from '../source/State.js';
import SourceState from '../source/State.js';
/**
* @constructor
@@ -130,7 +130,7 @@ _ol_renderer_Layer_.prototype.loadImage = function(image) {
*/
_ol_renderer_Layer_.prototype.renderIfReadyAndVisible = function() {
var layer = this.getLayer();
if (layer.getVisible() && layer.getSourceState() == _ol_source_State_.READY) {
if (layer.getVisible() && layer.getSourceState() == SourceState.READY) {
this.changed();
}
};

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

@@ -15,7 +15,7 @@ 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 RendererType from '../Type.js';
import _ol_source_State_ from '../../source/State.js';
import SourceState from '../../source/State.js';
/**
* @constructor
@@ -180,7 +180,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
layer = layerState.layer;
layerRenderer = /** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
if (!_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) ||
layerState.sourceState != _ol_source_State_.READY) {
layerState.sourceState != SourceState.READY) {
continue;
}
if (layerRenderer.prepareFrame(frameState, layerState)) {

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

@@ -14,7 +14,7 @@ import RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import RendererType from '../Type.js';
import _ol_source_State_ from '../../source/State.js';
import SourceState from '../../source/State.js';
import LRUCache from '../../structs/LRUCache.js';
import PriorityQueue from '../../structs/PriorityQueue.js';
import _ol_webgl_ from '../../webgl.js';
@@ -450,7 +450,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == _ol_source_State_.READY) {
layerState.sourceState == SourceState.READY) {
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
layerStatesToDraw.push(layerState);