Improve type checking in ol.interaction.Select

This commit is contained in:
Tom Payne
2014-01-29 20:40:48 +01:00
parent 7516aab1ca
commit e85cc8b80e

View File

@@ -38,12 +38,22 @@ ol.interaction.Select = function(opt_options) {
layerFilter = options.layerFilter; layerFilter = options.layerFilter;
} else if (goog.isDef(options.layer)) { } else if (goog.isDef(options.layer)) {
var layer = options.layer; var layer = options.layer;
layerFilter = function(l) { layerFilter =
/**
* @param {ol.layer.Layer} l Layer.
* @return {boolean} Include.
*/
function(l) {
return l === layer; return l === layer;
}; };
} else if (goog.isDef(options.layers)) { } else if (goog.isDef(options.layers)) {
var layers = options.layers; var layers = options.layers;
layerFilter = function(layer) { layerFilter =
/**
* @param {ol.layer.Layer} layer Layer.
* @return {boolean} Include.
*/
function(layer) {
return goog.array.indexOf(layers, layer) != -1; return goog.array.indexOf(layers, layer) != -1;
}; };
} else { } else {
@@ -102,6 +112,7 @@ ol.interaction.Select.prototype.handleMapBrowserEvent =
} }
}, undefined, this.layerFilter_); }, undefined, this.layerFilter_);
} else { } else {
/** @type {ol.Feature|undefined} */
var feature = map.forEachFeatureAtPixel(mapBrowserEvent.pixel, var feature = map.forEachFeatureAtPixel(mapBrowserEvent.pixel,
/** /**
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.