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

Remove use of goog.isNull

Browse Source
This commit is contained in:
Frederic Junod
2015-12-08 14:41:59 +01:00
parent 3413f6d138
commit aa2838cdcd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/interaction/selectinteraction.js
View File

@@ -360,12 +360,12 @@ ol.interaction.Select.prototype.setMap = function(map) {
var currentMap = this.getMap(); var currentMap = this.getMap();
var selectedFeatures = var selectedFeatures =
this.featureOverlay_.getSource().getFeaturesCollection(); this.featureOverlay_.getSource().getFeaturesCollection();
if (!goog.isNull(currentMap)) { if (currentMap) {
selectedFeatures.forEach(currentMap.unskipFeature, currentMap); selectedFeatures.forEach(currentMap.unskipFeature, currentMap);
} }
goog.base(this, 'setMap', map); goog.base(this, 'setMap', map);
this.featureOverlay_.setMap(map); this.featureOverlay_.setMap(map);
if (!goog.isNull(map)) { if (map) {
selectedFeatures.forEach(map.skipFeature, map); selectedFeatures.forEach(map.skipFeature, map);
} }
}; };
@@ -396,7 +396,7 @@ ol.interaction.Select.prototype.addFeature_ = function(evt) {
var map = this.getMap(); var map = this.getMap();
goog.asserts.assertInstanceof(feature, ol.Feature, goog.asserts.assertInstanceof(feature, ol.Feature,
'feature should be an ol.Feature'); 'feature should be an ol.Feature');
if (!goog.isNull(map)) { if (map) {
map.skipFeature(feature); map.skipFeature(feature);
} }
}; };
@@ -411,7 +411,7 @@ ol.interaction.Select.prototype.removeFeature_ = function(evt) {
var map = this.getMap(); var map = this.getMap();
goog.asserts.assertInstanceof(feature, ol.Feature, goog.asserts.assertInstanceof(feature, ol.Feature,
'feature should be an ol.Feature'); 'feature should be an ol.Feature');
if (!goog.isNull(map)) { if (map) {
map.unskipFeature(feature); map.unskipFeature(feature);
} }
}; };