From 0e402073dab5150bf2d0ac5e04c037c760bf9f1f Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 27 Sep 2019 13:09:12 +0200
Subject: [PATCH] Add more typecast for typescript

---
 src/ol/PluggableMap.js     | 8 ++++----
 src/ol/css.js              | 3 +++
 src/ol/render/canvas.js    | 3 +++
 src/ol/source/TileWMS.js   | 2 +-
 src/ol/structs/LRUCache.js | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js
index a064ae88b2..a65da29671 100644
--- a/src/ol/PluggableMap.js
+++ b/src/ol/PluggableMap.js
@@ -375,9 +375,9 @@ class PluggableMap extends BaseObject {
        * @param {import("./control/Control.js").default} control Control.
        * @this {PluggableMap}
        */
-      (function(control) {
+      function(control) {
         control.setMap(this);
-      }).bind(this));
+      }.bind(this));
 
     this.controls.addEventListener(CollectionEventType.ADD,
       /**
@@ -400,9 +400,9 @@ class PluggableMap extends BaseObject {
        * @param {import("./interaction/Interaction.js").default} interaction Interaction.
        * @this {PluggableMap}
        */
-      (function(interaction) {
+      function(interaction) {
         interaction.setMap(this);
-      }).bind(this));
+      }.bind(this));
 
     this.interactions.addEventListener(CollectionEventType.ADD,
       /**
diff --git a/src/ol/css.js b/src/ol/css.js
index 74455ec41a..c855fae7ea 100644
--- a/src/ol/css.js
+++ b/src/ol/css.js
@@ -72,6 +72,9 @@ export const CLASS_COLLAPSED = 'ol-collapsed';
  * @return {FontParameters} The font families (or null if the input spec is invalid).
  */
 export const getFontParameters = (function() {
+  /**
+   * @type {CSSStyleDeclaration}
+   */
   let style;
   /**
    * @type {Object<string, FontParameters>}
diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js
index 2d995c624b..8d0bfc2913 100644
--- a/src/ol/render/canvas.js
+++ b/src/ol/render/canvas.js
@@ -300,6 +300,9 @@ function getMeasureContext() {
  * @return {import("../size.js").Size} Measurement.
  */
 export const measureTextHeight = (function() {
+  /**
+   * @type {HTMLDivElement}
+   */
   let div;
   const heights = textHeights;
   return function(font) {
diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js
index ee39d13e1d..513e7ae132 100644
--- a/src/ol/source/TileWMS.js
+++ b/src/ol/source/TileWMS.js
@@ -81,7 +81,7 @@ class TileWMS extends TileImage {
    */
   constructor(opt_options) {
 
-    const options = opt_options ? opt_options : {};
+    const options = opt_options ? opt_options : /** @type {Options} */ ({});
 
     const params = options.params || {};
 
diff --git a/src/ol/structs/LRUCache.js b/src/ol/structs/LRUCache.js
index 29627c6119..3d9c89799a 100644
--- a/src/ol/structs/LRUCache.js
+++ b/src/ol/structs/LRUCache.js
@@ -96,7 +96,7 @@ class LRUCache extends EventTarget {
 
 
   /**
-   * @param {function(T, string, LRUCache): ?} f The function
+   * @param {function(T, string, LRUCache<T>): ?} f The function
    *     to call for every entry from the oldest to the newer. This function takes
    *     3 arguments (the entry value, the entry key and the LRUCache object).
    *     The return value is ignored.