diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index cae969f4e6..dad484f00a 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -104,7 +104,6 @@ class LayerGroup extends BaseLayer { } /** - * @param {import("../events/Event.js").default} event Event. * @private */ handleLayersChanged_() { diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index 56f0d4e9e6..4823818ef7 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -59,10 +59,9 @@ class LayerRenderer extends Observable { * @param {import("../coordinate.js").Coordinate} coordinate Coordinate. * @param {import("../PluggableMap.js").FrameState} frameState Frame state. * @param {number} hitTolerance Hit tolerance in pixels. - * @param {function(this: S, (import("../Feature.js").default|import("../render/Feature.js").default), import("../layer/Layer.js").default): T} callback Feature callback. - * @param {S} thisArg Value to use as `this` when executing `callback`. + * @param {function((import("../Feature.js").default|import("../render/Feature.js").default), import("../layer/Layer.js").default): T} callback Feature callback. * @return {T|void} Callback result. - * @template S,T + * @template T */ forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback) {} diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index 55905db6ee..786565c1d5 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -154,7 +154,7 @@ class MapRenderer extends Disposable { if (layer.getSource()) { result = layerRenderer.forEachFeatureAtCoordinate( layer.getSource().getWrapX() ? translatedCoordinate : coordinate, - frameState, hitTolerance, forEachFeatureAtCoordinate, thisArg); + frameState, hitTolerance, forEachFeatureAtCoordinate); } if (result) { return result; diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js index eb68d699df..a7005643d8 100644 --- a/src/ol/renderer/canvas/Layer.js +++ b/src/ol/renderer/canvas/Layer.js @@ -102,7 +102,7 @@ class CanvasLayerRenderer extends LayerRenderer { * @template S,T,U */ forEachLayerAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg) { - const hasFeature = this.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, TRUE, this); + const hasFeature = this.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, TRUE); if (hasFeature) { return callback.call(thisArg, this.getLayer(), null); diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index 52a559939e..90914b36f6 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -506,7 +506,7 @@ class WebGLMapRenderer extends MapRenderer { layerFilter.call(thisArg2, layer)) { const layerRenderer = this.getLayerRenderer(layer); result = layerRenderer.forEachFeatureAtCoordinate( - coordinate, frameState, hitTolerance, callback, thisArg); + coordinate, frameState, hitTolerance, callback); if (result) { return result; }