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

Make addLayer and removeLayer methods private

Browse Source
This commit is contained in:
ahocevar
2013-11-13 00:39:58 +01:00
parent b805a76ae1
commit f790992a77
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/interaction/modifyinteraction.js
View File

@@ -115,7 +115,7 @@ ol.interaction.Modify.prototype.setMap = function(map) {
oldMap.removeLayer(this.sketchLayer_); oldMap.removeLayer(this.sketchLayer_);
layers = oldMap.getLayerGroup().getLayers(); layers = oldMap.getLayerGroup().getLayers();
goog.asserts.assert(goog.isDef(layers)); goog.asserts.assert(goog.isDef(layers));
layers.forEach(goog.bind(this.removeLayer, this)); layers.forEach(goog.bind(this.removeLayer_, this));
layers.unlisten(ol.CollectionEventType.ADD, this.handleLayerAdded_, false, layers.unlisten(ol.CollectionEventType.ADD, this.handleLayerAdded_, false,
this); this);
layers.unlisten(ol.CollectionEventType.REMOVE, this.handleLayerRemoved_, layers.unlisten(ol.CollectionEventType.REMOVE, this.handleLayerRemoved_,
@@ -136,7 +136,7 @@ ol.interaction.Modify.prototype.setMap = function(map) {
} }
layers = map.getLayerGroup().getLayers(); layers = map.getLayerGroup().getLayers();
goog.asserts.assert(goog.isDef(layers)); goog.asserts.assert(goog.isDef(layers));
layers.forEach(goog.bind(this.addLayer, this)); layers.forEach(goog.bind(this.addLayer_, this));
layers.listen(ol.CollectionEventType.ADD, this.handleLayerAdded_, false, layers.listen(ol.CollectionEventType.ADD, this.handleLayerAdded_, false,
this); this);
layers.listen(ol.CollectionEventType.REMOVE, this.handleLayerRemoved_, layers.listen(ol.CollectionEventType.REMOVE, this.handleLayerRemoved_,
@@ -157,15 +157,16 @@ ol.interaction.Modify.prototype.setMap = function(map) {
*/ */
ol.interaction.Modify.prototype.handleLayerAdded_ = function(evt) { ol.interaction.Modify.prototype.handleLayerAdded_ = function(evt) {
goog.asserts.assertInstanceof(evt.getElement, ol.layer.Layer); goog.asserts.assertInstanceof(evt.getElement, ol.layer.Layer);
this.addLayer(evt.getElement); this.addLayer_(evt.getElement);
}; };
/** /**
* Add a layer for modification. * Add a layer for modification.
* @param {ol.layer.Layer} layer Layer. * @param {ol.layer.Layer} layer Layer.
* @private
*/ */
ol.interaction.Modify.prototype.addLayer = function(layer) { ol.interaction.Modify.prototype.addLayer_ = function(layer) {
if (this.layerFilter_(layer) && layer instanceof ol.layer.Vector && if (this.layerFilter_(layer) && layer instanceof ol.layer.Vector &&
!layer.getTemporary()) { !layer.getTemporary()) {
this.addIndex_(layer.getFeatures(ol.layer.Vector.selectedFeaturesFilter), this.addIndex_(layer.getFeatures(ol.layer.Vector.selectedFeaturesFilter),
@@ -182,15 +183,16 @@ ol.interaction.Modify.prototype.addLayer = function(layer) {
*/ */
ol.interaction.Modify.prototype.handleLayerRemoved_ = function(evt) { ol.interaction.Modify.prototype.handleLayerRemoved_ = function(evt) {
goog.asserts.assertInstanceof(evt.getElement, ol.layer.Layer); goog.asserts.assertInstanceof(evt.getElement, ol.layer.Layer);
this.removeLayer(evt.getElement()); this.removeLayer_(evt.getElement());
}; };
/** /**
* Remove a layer for modification. * Remove a layer for modification.
* @param {ol.layer.Layer} layer Layer. * @param {ol.layer.Layer} layer Layer.
* @private
*/ */
ol.interaction.Modify.prototype.removeLayer = function(layer) { ol.interaction.Modify.prototype.removeLayer_ = function(layer) {
if (this.layerFilter_(layer) && layer instanceof ol.layer.Vector && if (this.layerFilter_(layer) && layer instanceof ol.layer.Vector &&
!layer.getTemporary()) { !layer.getTemporary()) {
this.removeIndex_( this.removeIndex_(