From b4fced865d4976029fed771dec9e165d473af557 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 2 Oct 2018 12:54:27 -0600 Subject: [PATCH 1/3] Fix type check errors in ol/render/webgl/Immediate --- src/ol/render/webgl/Immediate.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index a62286a5c3..05ddd8c26a 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -96,6 +96,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.finish(context); // default colors const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -196,6 +197,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.finish(context); // default colors const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -221,6 +223,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawMultiPoint(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -246,6 +249,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawLineString(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -271,6 +275,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawMultiLineString(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -296,6 +301,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawPolygon(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -321,6 +327,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawMultiPolygon(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; @@ -346,6 +353,7 @@ class WebGLImmediateRenderer extends VectorContext { replay.drawCircle(geometry, data); replay.finish(context); const opacity = 1; + /** @type {Object} */ const skippedFeatures = {}; let featureCallback; const oneByOne = false; From ecaec7bbfa2020ee1a3239e7d41f38d21d63502b Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 2 Oct 2018 12:55:59 -0600 Subject: [PATCH 2/3] Fix type check errors in ol/render/webgl/ReplayGroup --- src/ol/render/webgl/ReplayGroup.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index 3f8c5dd639..6e3959dd89 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -121,9 +121,6 @@ class WebGLReplayGroup extends ReplayGroup { } let replay = replays[replayType]; if (replay === undefined) { - /** - * @type {Function} - */ const Constructor = BATCH_CONSTRUCTORS[replayType]; replay = new Constructor(this.tolerance_, this.maxExtent_); replays[replayType] = replay; From b1309578b4d92b857b4902383ed283aae1071afc Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 2 Oct 2018 12:56:36 -0600 Subject: [PATCH 3/3] Fix type check errors in ol/render/webgl/TextReplay --- src/ol/render/webgl/TextReplay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index ccde7298bf..9917cfefd0 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -266,8 +266,8 @@ class WebGLTextReplay extends WebGLTextureReplay { ctx.fillStyle = state.fillColor; ctx.strokeStyle = state.strokeColor; ctx.lineWidth = state.lineWidth; - ctx.lineCap = /*** @type {string} */ (state.lineCap); - ctx.lineJoin = /** @type {string} */ (state.lineJoin); + ctx.lineCap = /** @type {CanvasLineCap} */ (state.lineCap); + ctx.lineJoin = /** @type {CanvasLineJoin} */ (state.lineJoin); ctx.miterLimit = /** @type {number} */ (state.miterLimit); ctx.textAlign = 'left'; ctx.textBaseline = 'top';