Merge pull request #8736 from fredj/misc

Typescript misc fixes

src/ol/control/ZoomSlider.js

@@ -58,7 +58,7 @@ class ZoomSlider extends Control {
     });
 
     /**
-      * @type {!Array.<ol.EventsKey>}
+      * @type {!Array.<import("../events.js").EventsKey>}
       * @private
       */
     this.dragListenerKeys_ = [];

src/ol/layer/Group.js

@@ -104,7 +104,6 @@ class LayerGroup extends BaseLayer {
   }
 
   /**
-   * @param {import("../events/Event.js").default} event Event.
    * @private
    */
   handleLayersChanged_() {

src/ol/render/webgl/PolygonReplay.js

@@ -1035,7 +1035,7 @@ class WebGLPolygonReplay extends WebGLReplay {
     } else {
       const nullStrokeStyle = new Stroke({
         color: [0, 0, 0, 0],
-        lineWidth: 0
+        width: 0
       });
       this.lineStringReplay.setFillStrokeStyle(null, nullStrokeStyle);
     }

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) {}
 

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;

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);

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;
         }

src/ol/source/TileImage.js

@@ -18,7 +18,6 @@ import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
  * @typedef {Object} Options
  * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
  * @property {number} [cacheSize=2048] Cache size.
- * @property {import("../extent.js").Extent} [extent]
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you are using the WebGL renderer or if you want to
  * access pixel data with the Canvas renderer.  See
@@ -71,7 +70,6 @@ class TileImage extends UrlTile {
     super({
       attributions: options.attributions,
       cacheSize: options.cacheSize,
-      extent: options.extent,
       opaque: options.opaque,
       projection: options.projection,
       state: options.state,

src/ol/source/UrlTile.js

@@ -12,7 +12,6 @@ import {getKeyZXY} from '../tilecoord.js';
  * @typedef {Object} Options
  * @property {import("./Source.js").AttributionLike} [attributions]
  * @property {number} [cacheSize]
- * @property {import("../extent.js").Extent} [extent]
  * @property {boolean} [opaque]
  * @property {import("../proj.js").ProjectionLike} [projection]
  * @property {import("./State.js").default} [state]
@@ -42,7 +41,6 @@ class UrlTile extends TileSource {
     super({
       attributions: options.attributions,
       cacheSize: options.cacheSize,
-      extent: options.extent,
       opaque: options.opaque,
       projection: options.projection,
       state: options.state,

src/ol/source/VectorTile.js

@@ -91,7 +91,6 @@ class VectorTile extends UrlTile {
     super({
       attributions: options.attributions,
       cacheSize: options.cacheSize !== undefined ? options.cacheSize : 128,
-      extent: extent,
       opaque: false,
       projection: projection,
       state: options.state,