diff --git a/src/ol/map.js b/src/ol/map.js index c783f06fb1..061fb0bfd0 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -457,7 +457,8 @@ ol.Map.prototype.disposeInternal = function() { /** * @param {ol.Pixel} pixel Pixel. - * @param {function(this: S, ol.Feature): T} callback Feature callback. + * @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature + * callback. * @param {S=} opt_obj Scope. * @return {T|undefined} Callback result. * @template S,T diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 7a57f556ca..92b922df07 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -92,6 +92,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = goog.asserts.assert(!ol.extent.isEmpty(this.renderedExtent_)); goog.asserts.assert(!isNaN(this.renderedResolution_)); var coordinate = this.getMap().getCoordinateFromPixel(pixel); + var layer = this.getLayer(); var renderGeometryFunction = this.getRenderGeometryFunction_(); goog.asserts.assert(goog.isFunction(renderGeometryFunction)); return this.replayGroup_.forEachGeometryAtCoordinate(this.renderedExtent_, @@ -103,7 +104,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = function(geometry, data) { var feature = /** @type {ol.Feature} */ (data); goog.asserts.assert(goog.isDef(feature)); - return callback.call(opt_obj, feature); + return callback.call(opt_obj, feature, layer); }); } }; diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 23a2bf1d8d..eac5586f6f 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -44,7 +44,8 @@ goog.inherits(ol.renderer.Layer, goog.Disposable); /** * @param {ol.Pixel} pixel Pixel. - * @param {function(this: S, ol.Feature): T} callback Feature callback. + * @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature + * callback. * @param {S=} opt_obj Scope. * @return {T|undefined} Callback result. * @template S,T diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index ec57481bf0..35c1f5e55f 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -80,7 +80,8 @@ ol.renderer.Map.prototype.disposeInternal = function() { /** * @param {ol.Pixel} pixel Pixel. - * @param {function(this: S, ol.Feature): T} callback Feature callback. + * @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature + * callback. * @param {S=} opt_obj Scope. * @return {T|undefined} Callback result. * @template S,T