From 7a8a0c18ae27ddaa19a5bcd10fc619a8e3a64ac9 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 5 Jul 2019 11:07:10 +0200
Subject: [PATCH] Use CanvasLineJoin type instead of string

---
 src/ol/render/canvas.js           | 8 ++++----
 src/ol/render/canvas/Executor.js  | 2 +-
 src/ol/render/canvas/Immediate.js | 4 ++--
 src/ol/style/RegularShape.js      | 6 +++---
 src/ol/style/Stroke.js            | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js
index 0dc981a605..cabd683f88 100644
--- a/src/ol/render/canvas.js
+++ b/src/ol/render/canvas.js
@@ -21,7 +21,7 @@ import LabelCache from './canvas/LabelCache.js';
  * @property {string} [currentLineCap]
  * @property {Array<number>} currentLineDash
  * @property {number} [currentLineDashOffset]
- * @property {string} [currentLineJoin]
+ * @property {CanvasLineJoin} [currentLineJoin]
  * @property {number} [currentLineWidth]
  * @property {number} [currentMiterLimit]
  * @property {number} [lastStroke]
@@ -30,7 +30,7 @@ import LabelCache from './canvas/LabelCache.js';
  * @property {string} [lineCap]
  * @property {Array<number>} lineDash
  * @property {number} [lineDashOffset]
- * @property {string} [lineJoin]
+ * @property {CanvasLineJoin} [lineJoin]
  * @property {number} [lineWidth]
  * @property {number} [miterLimit]
  */
@@ -41,7 +41,7 @@ import LabelCache from './canvas/LabelCache.js';
  * @property {string} lineCap
  * @property {Array<number>} lineDash
  * @property {number} lineDashOffset
- * @property {string} lineJoin
+ * @property {CanvasLineJoin} lineJoin
  * @property {number} lineWidth
  * @property {number} miterLimit
  * @property {import("../colorlike.js").ColorLike} strokeStyle
@@ -113,7 +113,7 @@ export const defaultLineDashOffset = 0;
 
 /**
  * @const
- * @type {string}
+ * @type {CanvasLineJoin}
  */
 export const defaultLineJoin = 'round';
 
diff --git a/src/ol/render/canvas/Executor.js b/src/ol/render/canvas/Executor.js
index afb0198a8c..174fce8cd0 100644
--- a/src/ol/render/canvas/Executor.js
+++ b/src/ol/render/canvas/Executor.js
@@ -208,7 +208,7 @@ class Executor extends Disposable {
         context.strokeStyle = strokeState.strokeStyle;
         context.lineWidth = strokeWidth;
         context.lineCap = /** @type {CanvasLineCap} */ (strokeState.lineCap);
-        context.lineJoin = /** @type {CanvasLineJoin} */ (strokeState.lineJoin);
+        context.lineJoin = strokeState.lineJoin;
         context.miterLimit = strokeState.miterLimit;
         if (context.setLineDash && strokeState.lineDash.length) {
           context.setLineDash(strokeState.lineDash);
diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js
index b87f972234..16d01f7724 100644
--- a/src/ol/render/canvas/Immediate.js
+++ b/src/ol/render/canvas/Immediate.js
@@ -697,7 +697,7 @@ class CanvasImmediateRenderer extends VectorContext {
         context.setLineDash(strokeState.lineDash);
         context.lineDashOffset = strokeState.lineDashOffset;
       }
-      context.lineJoin = /** @type {CanvasLineJoin} */ (strokeState.lineJoin);
+      context.lineJoin = strokeState.lineJoin;
       context.lineWidth = strokeState.lineWidth;
       context.miterLimit = strokeState.miterLimit;
       context.strokeStyle = strokeState.strokeStyle;
@@ -724,7 +724,7 @@ class CanvasImmediateRenderer extends VectorContext {
         }
       }
       if (contextStrokeState.lineJoin != strokeState.lineJoin) {
-        contextStrokeState.lineJoin = context.lineJoin = /** @type {CanvasLineJoin} */ (strokeState.lineJoin);
+        contextStrokeState.lineJoin = context.lineJoin = strokeState.lineJoin;
       }
       if (contextStrokeState.lineWidth != strokeState.lineWidth) {
         contextStrokeState.lineWidth = context.lineWidth = strokeState.lineWidth;
diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js
index b7fcf9b930..0af81de92c 100644
--- a/src/ol/style/RegularShape.js
+++ b/src/ol/style/RegularShape.js
@@ -33,7 +33,7 @@ import ImageStyle from './Image.js';
  * @property {string} lineCap
  * @property {Array<number>} lineDash
  * @property {number} lineDashOffset
- * @property {string} lineJoin
+ * @property {CanvasLineJoin} lineJoin
  * @property {number} miterLimit
  */
 
@@ -303,7 +303,7 @@ class RegularShape extends ImageStyle {
    */
   render() {
     let lineCap = '';
-    let lineJoin = '';
+    let lineJoin = defaultLineJoin;
     let miterLimit = 0;
     let lineDash = null;
     let lineDashOffset = 0;
@@ -418,7 +418,7 @@ class RegularShape extends ImageStyle {
         context.lineDashOffset = renderOptions.lineDashOffset;
       }
       context.lineCap = /** @type {CanvasLineCap} */ (renderOptions.lineCap);
-      context.lineJoin = /** @type {CanvasLineJoin} */ (renderOptions.lineJoin);
+      context.lineJoin = renderOptions.lineJoin;
       context.miterLimit = renderOptions.miterLimit;
       context.stroke();
     }
diff --git a/src/ol/style/Stroke.js b/src/ol/style/Stroke.js
index d73b9b55e1..05f4926135 100644
--- a/src/ol/style/Stroke.js
+++ b/src/ol/style/Stroke.js
@@ -9,7 +9,7 @@
  * See {@link module:ol/color~Color} and {@link module:ol/colorlike~ColorLike} for possible formats.
  * Default null; if null, the Canvas/renderer default black will be used.
  * @property {string} [lineCap='round'] Line cap style: `butt`, `round`, or `square`.
- * @property {string} [lineJoin='round'] Line join style: `bevel`, `round`, or `miter`.
+ * @property {CanvasLineJoin} [lineJoin='round'] Line join style: `bevel`, `round`, or `miter`.
  * @property {Array<number>} [lineDash] Line dash pattern. Default is `undefined` (no dash).
  * Please note that Internet Explorer 10 and lower do not support the `setLineDash` method on
  * the `CanvasRenderingContext2D` and therefore this option will have no visual effect in these browsers.
@@ -61,7 +61,7 @@ class Stroke {
 
     /**
      * @private
-     * @type {string|undefined}
+     * @type {CanvasLineJoin|undefined}
      */
     this.lineJoin_ = options.lineJoin;
 
@@ -134,7 +134,7 @@ class Stroke {
 
   /**
    * Get the line join type for the stroke.
-   * @return {string|undefined} Line join.
+   * @return {CanvasLineJoin|undefined} Line join.
    * @api
    */
   getLineJoin() {
@@ -208,7 +208,7 @@ class Stroke {
   /**
    * Set the line join.
    *
-   * @param {string|undefined} lineJoin Line join.
+   * @param {CanvasLineJoin|undefined} lineJoin Line join.
    * @api
    */
   setLineJoin(lineJoin) {