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

Rename _ol_layer_Layer_ to Layer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:23:52 -07:00
parent c6646b1cda
commit f94d69c7a8
12 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/control/Attribution.js
View File

@@ -8,7 +8,7 @@ import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';
import {removeChildren, replaceNode} from '../dom.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import Layer from '../layer/Layer.js';
/**
* @classdesc
@@ -146,7 +146,7 @@ Attribution.prototype.getSourceAttributions_ = function(frameState) {
var resolution = frameState.viewState.resolution;
for (var i = 0, ii = layerStatesArray.length; i < ii; ++i) {
var layerState = layerStatesArray[i];
if (!_ol_layer_Layer_.visibleAtResolution(layerState, resolution)) {
if (!Layer.visibleAtResolution(layerState, resolution)) {
continue;
}

6
src/ol/layer/Image.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import Layer from '../layer/Layer.js';
/**
* @classdesc
@@ -21,7 +21,7 @@ import _ol_layer_Layer_ from '../layer/Layer.js';
*/
var ImageLayer = function(opt_options) {
var options = opt_options ? opt_options : {};
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (options));
Layer.call(this, /** @type {olx.layer.LayerOptions} */ (options));
/**
* The layer type.
@@ -32,7 +32,7 @@ var ImageLayer = function(opt_options) {
};
inherits(ImageLayer, _ol_layer_Layer_);
inherits(ImageLayer, Layer);
/**

24
src/ol/layer/Layer.js
View File

@@ -33,7 +33,7 @@ import SourceState from '../source/State.js';
* @param {olx.layer.LayerOptions} options Layer options.
* @api
*/
var _ol_layer_Layer_ = function(options) {
var Layer = function(options) {
var baseOptions = _ol_obj_.assign({}, options);
delete baseOptions.source;
@@ -70,7 +70,7 @@ var _ol_layer_Layer_ = function(options) {
this.setSource(source);
};
inherits(_ol_layer_Layer_, BaseLayer);
inherits(Layer, BaseLayer);
/**
@@ -81,7 +81,7 @@ inherits(_ol_layer_Layer_, BaseLayer);
* @param {number} resolution Resolution.
* @return {boolean} The layer is visible at the given resolution.
*/
_ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
Layer.visibleAtResolution = function(layerState, resolution) {
return layerState.visible && resolution >= layerState.minResolution &&
resolution < layerState.maxResolution;
};
@@ -90,7 +90,7 @@ _ol_layer_Layer_.visibleAtResolution = function(layerState, resolution) {
/**
* @inheritDoc
*/
_ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
Layer.prototype.getLayersArray = function(opt_array) {
var array = opt_array ? opt_array : [];
array.push(this);
return array;
@@ -100,7 +100,7 @@ _ol_layer_Layer_.prototype.getLayersArray = function(opt_array) {
/**
* @inheritDoc
*/
_ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
Layer.prototype.getLayerStatesArray = function(opt_states) {
var states = opt_states ? opt_states : [];
states.push(this.getLayerState());
return states;
@@ -113,7 +113,7 @@ _ol_layer_Layer_.prototype.getLayerStatesArray = function(opt_states) {
* @observable
* @api
*/
_ol_layer_Layer_.prototype.getSource = function() {
Layer.prototype.getSource = function() {
var source = this.get(LayerProperty.SOURCE);
return /** @type {ol.source.Source} */ (source) || null;
};
@@ -122,7 +122,7 @@ _ol_layer_Layer_.prototype.getSource = function() {
/**
* @inheritDoc
*/
_ol_layer_Layer_.prototype.getSourceState = function() {
Layer.prototype.getSourceState = function() {
var source = this.getSource();
return !source ? SourceState.UNDEFINED : source.getState();
};
@@ -131,7 +131,7 @@ _ol_layer_Layer_.prototype.getSourceState = function() {
/**
* @private
*/
_ol_layer_Layer_.prototype.handleSourceChange_ = function() {
Layer.prototype.handleSourceChange_ = function() {
this.changed();
};
@@ -139,7 +139,7 @@ _ol_layer_Layer_.prototype.handleSourceChange_ = function() {
/**
* @private
*/
_ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
Layer.prototype.handleSourcePropertyChange_ = function() {
if (this.sourceChangeKey_) {
_ol_events_.unlistenByKey(this.sourceChangeKey_);
this.sourceChangeKey_ = null;
@@ -165,7 +165,7 @@ _ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
* @param {ol.PluggableMap} map Map.
* @api
*/
_ol_layer_Layer_.prototype.setMap = function(map) {
Layer.prototype.setMap = function(map) {
if (this.mapPrecomposeKey_) {
_ol_events_.unlistenByKey(this.mapPrecomposeKey_);
this.mapPrecomposeKey_ = null;
@@ -199,7 +199,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
* @observable
* @api
*/
_ol_layer_Layer_.prototype.setSource = function(source) {
Layer.prototype.setSource = function(source) {
this.set(LayerProperty.SOURCE, source);
};
export default _ol_layer_Layer_;
export default Layer;

6
src/ol/layer/Tile.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import Layer from '../layer/Layer.js';
import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
import _ol_obj_ from '../obj.js';
@@ -28,7 +28,7 @@ var TileLayer = function(opt_options) {
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
this.setPreload(options.preload !== undefined ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
@@ -43,7 +43,7 @@ var TileLayer = function(opt_options) {
};
inherits(TileLayer, _ol_layer_Layer_);
inherits(TileLayer, Layer);
/**

6
src/ol/layer/Vector.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import LayerType from '../LayerType.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import Layer from '../layer/Layer.js';
import _ol_layer_VectorRenderType_ from '../layer/VectorRenderType.js';
import _ol_obj_ from '../obj.js';
import _ol_style_Style_ from '../style/Style.js';
@@ -41,7 +41,7 @@ var VectorLayer = function(opt_options) {
delete baseOptions.renderBuffer;
delete baseOptions.updateWhileAnimating;
delete baseOptions.updateWhileInteracting;
_ol_layer_Layer_.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
/**
* @private
@@ -101,7 +101,7 @@ var VectorLayer = function(opt_options) {
};
inherits(VectorLayer, _ol_layer_Layer_);
inherits(VectorLayer, Layer);
/**

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

@@ -7,7 +7,7 @@ import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import {getWidth} from '../extent.js';
import {TRUE} from '../functions.js';
import _ol_layer_Layer_ from '../layer/Layer.js';
import Layer from '../layer/Layer.js';
import {getLayerRendererPlugins} from '../plugins.js';
import {iconImageCache} from '../style.js';
import _ol_transform_ from '../transform.js';
@@ -141,7 +141,7 @@ MapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameSta
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
if (Layer.visibleAtResolution(layerState, viewResolution) &&
layerFilter.call(thisArg2, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
if (layer.getSource()) {

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

@@ -8,7 +8,7 @@ import {inherits} from '../../index.js';
import {stableSort} from '../../array.js';
import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_layer_Layer_ from '../../layer/Layer.js';
import Layer from '../../layer/Layer.js';
import RenderEvent from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
@@ -179,7 +179,7 @@ CanvasMapRenderer.prototype.renderFrame = function(frameState) {
layerState = layerStatesArray[i];
layer = layerState.layer;
layerRenderer = /** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
if (!_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) ||
if (!Layer.visibleAtResolution(layerState, viewResolution) ||
layerState.sourceState != SourceState.READY) {
continue;
}
@@ -223,7 +223,7 @@ CanvasMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, ca
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
if (Layer.visibleAtResolution(layerState, viewResolution) &&
layerFilter.call(thisArg2, layer)) {
var layerRenderer = /** @type {ol.renderer.canvas.Layer} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtCoordinate(

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

@@ -8,7 +8,7 @@ import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js';
import _ol_has_ from '../../has.js';
import _ol_layer_Layer_ from '../../layer/Layer.js';
import Layer from '../../layer/Layer.js';
import RenderEvent from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
@@ -449,7 +449,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
var i, ii, layerRenderer, layerState;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
if (Layer.visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == SourceState.READY) {
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
@@ -524,7 +524,7 @@ WebGLMapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, fra
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg2, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
result = layerRenderer.forEachFeatureAtCoordinate(
@@ -556,7 +556,7 @@ WebGLMapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameSt
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
hasFeature =
@@ -588,7 +588,7 @@ WebGLMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, cal
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
var layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtPixel(