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

Rename _ol_layer_Group_ to LayerGroup

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:22:19 -07:00
parent ba206c9683
commit c6646b1cda
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/PluggableMap.js
View File

@@ -23,7 +23,7 @@ import EventType from './events/EventType.js';
import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEmpty} from './extent.js';
import {TRUE} from './functions.js';
import _ol_has_ from './has.js';
import _ol_layer_Group_ from './layer/Group.js';
import LayerGroup from './layer/Group.js';
import {getMapRendererPlugins} from './plugins.js';
import RendererType from './renderer/Type.js';
import _ol_size_ from './size.js';
@@ -1404,8 +1404,8 @@ function createOptionsInternal(options) {
*/
var values = {};
var layerGroup = (options.layers instanceof _ol_layer_Group_) ?
options.layers : new _ol_layer_Group_({layers: options.layers});
var layerGroup = (options.layers instanceof LayerGroup) ?
options.layers : new LayerGroup({layers: options.layers});
values[MapProperty.LAYERGROUP] = layerGroup;
values[MapProperty.TARGET] = options.target;

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

@@ -35,7 +35,7 @@ var Property = {
* @param {olx.layer.GroupOptions=} opt_options Layer options.
* @api
*/
var _ol_layer_Group_ = function(opt_options) {
var LayerGroup = function(opt_options) {
var options = opt_options || {};
var baseOptions = /** @type {olx.layer.GroupOptions} */
@@ -78,13 +78,13 @@ var _ol_layer_Group_ = function(opt_options) {
};
inherits(_ol_layer_Group_, BaseLayer);
inherits(LayerGroup, BaseLayer);
/**
* @private
*/
_ol_layer_Group_.prototype.handleLayerChange_ = function() {
LayerGroup.prototype.handleLayerChange_ = function() {
this.changed();
};
@@ -93,7 +93,7 @@ _ol_layer_Group_.prototype.handleLayerChange_ = function() {
* @param {ol.events.Event} event Event.
* @private
*/
_ol_layer_Group_.prototype.handleLayersChanged_ = function(event) {
LayerGroup.prototype.handleLayersChanged_ = function(event) {
this.layersListenerKeys_.forEach(_ol_events_.unlistenByKey);
this.layersListenerKeys_.length = 0;
@@ -129,7 +129,7 @@ _ol_layer_Group_.prototype.handleLayersChanged_ = function(event) {
* @param {ol.Collection.Event} collectionEvent Collection event.
* @private
*/
_ol_layer_Group_.prototype.handleLayersAdd_ = function(collectionEvent) {
LayerGroup.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = getUid(layer).toString();
this.listenerKeys_[key] = [
@@ -146,7 +146,7 @@ _ol_layer_Group_.prototype.handleLayersAdd_ = function(collectionEvent) {
* @param {ol.Collection.Event} collectionEvent Collection event.
* @private
*/
_ol_layer_Group_.prototype.handleLayersRemove_ = function(collectionEvent) {
LayerGroup.prototype.handleLayersRemove_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = getUid(layer).toString();
this.listenerKeys_[key].forEach(_ol_events_.unlistenByKey);
@@ -163,7 +163,7 @@ _ol_layer_Group_.prototype.handleLayersRemove_ = function(collectionEvent) {
* @observable
* @api
*/
_ol_layer_Group_.prototype.getLayers = function() {
LayerGroup.prototype.getLayers = function() {
return (/** @type {!ol.Collection.<ol.layer.Base>} */ this.get(Property.LAYERS));
};
@@ -176,7 +176,7 @@ _ol_layer_Group_.prototype.getLayers = function() {
* @observable
* @api
*/
_ol_layer_Group_.prototype.setLayers = function(layers) {
LayerGroup.prototype.setLayers = function(layers) {
this.set(Property.LAYERS, layers);
};
@@ -184,7 +184,7 @@ _ol_layer_Group_.prototype.setLayers = function(layers) {
/**
* @inheritDoc
*/
_ol_layer_Group_.prototype.getLayersArray = function(opt_array) {
LayerGroup.prototype.getLayersArray = function(opt_array) {
var array = opt_array !== undefined ? opt_array : [];
this.getLayers().forEach(function(layer) {
layer.getLayersArray(array);
@@ -196,7 +196,7 @@ _ol_layer_Group_.prototype.getLayersArray = function(opt_array) {
/**
* @inheritDoc
*/
_ol_layer_Group_.prototype.getLayerStatesArray = function(opt_states) {
LayerGroup.prototype.getLayerStatesArray = function(opt_states) {
var states = opt_states !== undefined ? opt_states : [];
var pos = states.length;
@@ -231,8 +231,8 @@ _ol_layer_Group_.prototype.getLayerStatesArray = function(opt_states) {
/**
* @inheritDoc
*/
_ol_layer_Group_.prototype.getSourceState = function() {
LayerGroup.prototype.getSourceState = function() {
return SourceState.READY;
};
export default _ol_layer_Group_;
export default LayerGroup;