Merge pull request #8869 from ahocevar/typescript-fixes

Fix more types for TypeScript

src/ol/renderer/Map.js

@@ -154,9 +154,10 @@ class MapRenderer extends Disposable {
       const layer = layerState.layer;
       if (visibleAtResolution(layerState, viewResolution) && layerFilter.call(thisArg2, layer)) {
         const layerRenderer = this.getLayerRenderer(layer);
-        if (layer.getSource()) {
+        const source = /** @type {import("../layer/Layer.js").default} */ (layer).getSource();
+        if (source) {
           result = layerRenderer.forEachFeatureAtCoordinate(
-            layer.getSource().getWrapX() ? translatedCoordinate : coordinate,
+            source.getWrapX() ? translatedCoordinate : coordinate,
             frameState, hitTolerance, forEachFeatureAtCoordinate);
         }
         if (result) {
@@ -207,7 +208,7 @@ class MapRenderer extends Disposable {
   }
 
   /**
-   * @param {import("../layer/Layer.js").default} layer Layer.
+   * @param {import("../layer/Base.js").default} layer Layer.
    * @protected
    * @return {import("./Layer.js").default} Layer renderer.
    */

src/ol/renderer/canvas/ImageLayer.js

@@ -180,11 +180,11 @@ class CanvasImageLayerRenderer extends IntermediateCanvasRenderer {
   /**
    * @inheritDoc
    */
-  forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg) {
+  forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback) {
     if (this.vectorRenderer_) {
-      return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg);
+      return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback);
     } else {
-      return super.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg);
+      return super.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback);
     }
   }
 }