From d0728a5e65dcef80f3ac71075a9731ddd56b3606 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 19 Dec 2017 08:33:14 +0100 Subject: [PATCH] Rename _ol_source_State_ to SourceState --- src/ol/layer/Group.js | 4 ++-- src/ol/layer/Layer.js | 4 ++-- src/ol/renderer/Layer.js | 4 ++-- src/ol/renderer/canvas/Map.js | 4 ++-- src/ol/renderer/webgl/Map.js | 4 ++-- src/ol/source/BingMaps.js | 8 ++++---- src/ol/source/CartoDB.js | 12 ++++++------ src/ol/source/Raster.js | 4 ++-- src/ol/source/Source.js | 4 ++-- src/ol/source/TileJSON.js | 8 ++++---- src/ol/source/TileUTFGrid.js | 10 +++++----- src/ol/source/Vector.js | 4 ++-- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index 112bbed2ce..ae07cd6370 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -12,7 +12,7 @@ import EventType from '../events/EventType.js'; import {getIntersection} from '../extent.js'; import _ol_layer_Base_ from '../layer/Base.js'; import _ol_obj_ from '../obj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; /** @@ -232,7 +232,7 @@ _ol_layer_Group_.prototype.getLayerStatesArray = function(opt_states) { * @inheritDoc */ _ol_layer_Group_.prototype.getSourceState = function() { - return _ol_source_State_.READY; + return SourceState.READY; }; export default _ol_layer_Group_; diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js index 12c8cb9f53..72b65b803d 100644 --- a/src/ol/layer/Layer.js +++ b/src/ol/layer/Layer.js @@ -9,7 +9,7 @@ import _ol_layer_Base_ from '../layer/Base.js'; import _ol_layer_Property_ from '../layer/Property.js'; import _ol_obj_ from '../obj.js'; import RenderEventType from '../render/EventType.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; /** * @classdesc @@ -124,7 +124,7 @@ _ol_layer_Layer_.prototype.getSource = function() { */ _ol_layer_Layer_.prototype.getSourceState = function() { var source = this.getSource(); - return !source ? _ol_source_State_.UNDEFINED : source.getState(); + return !source ? SourceState.UNDEFINED : source.getState(); }; diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index fde1389c4c..89e4010222 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -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(); } }; diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js index 549e1542c5..6e9dd38802 100644 --- a/src/ol/renderer/canvas/Map.js +++ b/src/ol/renderer/canvas/Map.js @@ -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)) { diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index aac017c819..1f8dd8a4af 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -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); diff --git a/src/ol/source/BingMaps.js b/src/ol/source/BingMaps.js index d2f921274b..7582db5cf1 100644 --- a/src/ol/source/BingMaps.js +++ b/src/ol/source/BingMaps.js @@ -6,7 +6,7 @@ import {createFromTileUrlFunctions} from '../tileurlfunction.js'; import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_TileImage_ from '../source/TileImage.js'; import _ol_tilecoord_ from '../tilecoord.js'; import _ol_tilegrid_ from '../tilegrid.js'; @@ -34,7 +34,7 @@ var _ol_source_BingMaps_ = function(options) { opaque: true, projection: getProjection('EPSG:3857'), reprojectionErrorThreshold: options.reprojectionErrorThreshold, - state: _ol_source_State_.LOADING, + state: SourceState.LOADING, tileLoadFunction: options.tileLoadFunction, tilePixelRatio: this.hidpi_ ? 2 : 1, wrapX: options.wrapX !== undefined ? options.wrapX : true, @@ -121,7 +121,7 @@ _ol_source_BingMaps_.prototype.handleImageryMetadataResponse = function(response response.authenticationResultCode != 'ValidCredentials' || response.resourceSets.length != 1 || response.resourceSets[0].resources.length != 1) { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); return; } @@ -204,6 +204,6 @@ _ol_source_BingMaps_.prototype.handleImageryMetadataResponse = function(response }); } - this.setState(_ol_source_State_.READY); + this.setState(SourceState.READY); }; export default _ol_source_BingMaps_; diff --git a/src/ol/source/CartoDB.js b/src/ol/source/CartoDB.js index 9a88a0fbc1..57c24d60ce 100644 --- a/src/ol/source/CartoDB.js +++ b/src/ol/source/CartoDB.js @@ -3,7 +3,7 @@ */ import {inherits} from '../index.js'; import _ol_obj_ from '../obj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_XYZ_ from '../source/XYZ.js'; /** @@ -48,7 +48,7 @@ var _ol_source_CartoDB_ = function(options) { maxZoom: options.maxZoom !== undefined ? options.maxZoom : 18, minZoom: options.minZoom, projection: options.projection, - state: _ol_source_State_.LOADING, + state: SourceState.LOADING, wrapX: options.wrapX }); this.initializeMap_(); @@ -132,14 +132,14 @@ _ol_source_CartoDB_.prototype.handleInitResponse_ = function(paramHash, event) { try { response = /** @type {CartoDBLayerInfo} */(JSON.parse(client.responseText)); } catch (err) { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); return; } this.applyTemplate_(response); this.templateCache_[paramHash] = response; - this.setState(_ol_source_State_.READY); + this.setState(SourceState.READY); } else { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); } }; @@ -149,7 +149,7 @@ _ol_source_CartoDB_.prototype.handleInitResponse_ = function(paramHash, event) { * @param {Event} event Event. */ _ol_source_CartoDB_.prototype.handleInitError_ = function(event) { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); }; diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index 7efc4be015..63b3841848 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -17,7 +17,7 @@ import _ol_renderer_canvas_ImageLayer_ from '../renderer/canvas/ImageLayer.js'; import _ol_renderer_canvas_TileLayer_ from '../renderer/canvas/TileLayer.js'; import _ol_source_Image_ from '../source/Image.js'; import _ol_source_RasterOperationType_ from '../source/RasterOperationType.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_Tile_ from '../source/Tile.js'; import _ol_transform_ from '../transform.js'; @@ -201,7 +201,7 @@ _ol_source_Raster_.prototype.allSourcesReady_ = function() { var source; for (var i = 0, ii = this.renderers_.length; i < ii; ++i) { source = this.renderers_[i].getLayer().getSource(); - if (source.getState() !== _ol_source_State_.READY) { + if (source.getState() !== SourceState.READY) { ready = false; break; } diff --git a/src/ol/source/Source.js b/src/ol/source/Source.js index 9db8b45901..70cbbebcf3 100644 --- a/src/ol/source/Source.js +++ b/src/ol/source/Source.js @@ -4,7 +4,7 @@ import {inherits, nullFunction} from '../index.js'; import _ol_Object_ from '../Object.js'; import {get as getProjection} from '../proj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; /** @@ -42,7 +42,7 @@ var _ol_source_Source_ = function(options) { * @type {ol.source.State} */ this.state_ = options.state !== undefined ? - options.state : _ol_source_State_.READY; + options.state : SourceState.READY; /** * @private diff --git a/src/ol/source/TileJSON.js b/src/ol/source/TileJSON.js index b135952a59..17cf4fc0f6 100644 --- a/src/ol/source/TileJSON.js +++ b/src/ol/source/TileJSON.js @@ -13,7 +13,7 @@ import {assert} from '../asserts.js'; import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_TileImage_ from '../source/TileImage.js'; import _ol_tilegrid_ from '../tilegrid.js'; @@ -40,7 +40,7 @@ var _ol_source_TileJSON_ = function(options) { crossOrigin: options.crossOrigin, projection: getProjection('EPSG:3857'), reprojectionErrorThreshold: options.reprojectionErrorThreshold, - state: _ol_source_State_.LOADING, + state: SourceState.LOADING, tileLoadFunction: options.tileLoadFunction, wrapX: options.wrapX !== undefined ? options.wrapX : true, transition: options.transition @@ -148,7 +148,7 @@ _ol_source_TileJSON_.prototype.handleTileJSONResponse = function(tileJSON) { } this.tileJSON_ = tileJSON; - this.setState(_ol_source_State_.READY); + this.setState(SourceState.READY); }; @@ -157,6 +157,6 @@ _ol_source_TileJSON_.prototype.handleTileJSONResponse = function(tileJSON) { * @protected */ _ol_source_TileJSON_.prototype.handleTileJSONError = function() { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); }; export default _ol_source_TileJSON_; diff --git a/src/ol/source/TileUTFGrid.js b/src/ol/source/TileUTFGrid.js index 6a20f53155..0c385b5242 100644 --- a/src/ol/source/TileUTFGrid.js +++ b/src/ol/source/TileUTFGrid.js @@ -11,7 +11,7 @@ import EventType from '../events/EventType.js'; import {applyTransform, intersects} from '../extent.js'; import _ol_net_ from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_Tile_ from '../source/Tile.js'; import _ol_tilecoord_ from '../tilecoord.js'; import _ol_tilegrid_ from '../tilegrid.js'; @@ -28,7 +28,7 @@ import _ol_tilegrid_ from '../tilegrid.js'; var _ol_source_TileUTFGrid_ = function(options) { _ol_source_Tile_.call(this, { projection: getProjection('EPSG:3857'), - state: _ol_source_State_.LOADING + state: SourceState.LOADING }); /** @@ -155,7 +155,7 @@ _ol_source_TileUTFGrid_.prototype.forDataAtCoordinateAndResolution = function( * @protected */ _ol_source_TileUTFGrid_.prototype.handleTileJSONError = function() { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); }; @@ -189,7 +189,7 @@ _ol_source_TileUTFGrid_.prototype.handleTileJSONResponse = function(tileJSON) { var grids = tileJSON.grids; if (!grids) { - this.setState(_ol_source_State_.ERROR); + this.setState(SourceState.ERROR); return; } @@ -207,7 +207,7 @@ _ol_source_TileUTFGrid_.prototype.handleTileJSONResponse = function(tileJSON) { }); } - this.setState(_ol_source_State_.READY); + this.setState(SourceState.READY); }; diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index 849670b350..d4dd04cdea 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -17,7 +17,7 @@ import {TRUE} from '../functions.js'; import _ol_loadingstrategy_ from '../loadingstrategy.js'; import _ol_obj_ from '../obj.js'; import _ol_source_Source_ from '../source/Source.js'; -import _ol_source_State_ from '../source/State.js'; +import SourceState from '../source/State.js'; import _ol_source_VectorEventType_ from '../source/VectorEventType.js'; import RBush from '../structs/RBush.js'; @@ -40,7 +40,7 @@ var _ol_source_Vector_ = function(opt_options) { _ol_source_Source_.call(this, { attributions: options.attributions, projection: undefined, - state: _ol_source_State_.READY, + state: SourceState.READY, wrapX: options.wrapX !== undefined ? options.wrapX : true });