diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index a7cff40d4c..26da9bb50e 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -52,7 +52,9 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.view2DState.resolution; var rotation = frameState.view2DState.rotation; - return source.forEachFeatureAtPixel(extent, resolution, rotation, coordinate, + var skippedFeatureUids = frameState.skippedFeatureUids_; + return source.forEachFeatureAtPixel( + extent, resolution, rotation, coordinate, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 5dd4bab463..7cacb017e2 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -57,7 +57,9 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.view2DState.resolution; var rotation = frameState.view2DState.rotation; - return source.forEachFeatureAtPixel(extent, resolution, rotation, coordinate, + var skippedFeatureUids = frameState.skippedFeatureUids_; + return source.forEachFeatureAtPixel( + extent, resolution, rotation, coordinate, skippedFeatureUids, /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index e2ea1e0503..cdbdba2c11 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -83,7 +83,10 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.view2DState.resolution; var rotation = frameState.view2DState.rotation; - return source.forEachFeatureAtPixel(extent, resolution, rotation, coordinate, + var skippedFeatureUids = frameState.skippedFeatureUids_; + return source.forEachFeatureAtPixel( + extent, resolution, rotation, coordinate, skippedFeatureUids, + /** * @param {ol.Feature} feature Feature. * @return {?} Callback result. diff --git a/src/ol/source/imagevectorsource.js b/src/ol/source/imagevectorsource.js index fb1375b62c..c26b1a9d87 100644 --- a/src/ol/source/imagevectorsource.js +++ b/src/ol/source/imagevectorsource.js @@ -144,13 +144,13 @@ ol.source.ImageVector.prototype.canvasFunctionInternal_ = /** * @inheritDoc */ -ol.source.ImageVector.prototype.forEachFeatureAtPixel = - function(extent, resolution, rotation, coordinate, callback) { +ol.source.ImageVector.prototype.forEachFeatureAtPixel = function( + extent, resolution, rotation, coordinate, skippedFeatureUids, callback) { if (goog.isNull(this.replayGroup_)) { return undefined; } else { return this.replayGroup_.forEachGeometryAtPixel( - extent, resolution, 0, coordinate, {}, + extent, resolution, 0, coordinate, skippedFeatureUids, /** * @param {ol.geom.Geometry} geometry Geometry. * @param {Object} data Data. diff --git a/src/ol/source/source.js b/src/ol/source/source.js index e2d2f32b13..0ece496de6 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -88,6 +88,7 @@ goog.inherits(ol.source.Source, ol.Observable); * @param {number} resolution Resolution. * @param {number} rotation Rotation. * @param {ol.Coordinate} coordinate Coordinate. + * @param {Object.} skippedFeatureUids Skipped feature uids. * @param {function(ol.Feature): T} callback Feature callback. * @return {T|undefined} Callback result. * @template T