From f7adeac774b5bad0f53d8ce154ada9a6634fcf76 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 16 Oct 2018 08:32:18 -0600 Subject: [PATCH 1/4] Fix arguments passed to forEachLayerAtCoordinate --- src/ol/renderer/canvas/IntermediateCanvas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index dd4149c7af..2b24b3e958 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -120,7 +120,7 @@ class IntermediateCanvasRenderer extends CanvasLayerRenderer { if (this.getLayer().getSource().forEachFeatureAtCoordinate !== VOID) { // for ImageCanvas sources use the original hit-detection logic, // so that for example also transparent polygons are detected - return super.forEachLayerAtCoordinate(arguments); + return super.forEachLayerAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg); } else { const pixel = applyTransform(this.coordinateToCanvasPixelTransform, coordinate.slice()); scaleCoordinate(pixel, frameState.viewState.resolution / this.renderedResolution); From fb11aad1d1064ecbc60d057dc6554ca5e6863a49 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 16 Oct 2018 08:33:09 -0600 Subject: [PATCH 2/4] Fix geometry type in ol/renderer/vector#renderGeometry --- src/ol/renderer/vector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js index 9412568dfd..8d5a93ad4a 100644 --- a/src/ol/renderer/vector.js +++ b/src/ol/renderer/vector.js @@ -142,7 +142,7 @@ function renderFeatureInternal(replayGroup, feature, style, squaredTolerance) { /** * @param {import("../render/ReplayGroup.js").default} replayGroup Replay group. - * @param {import("../geom/Geometry.js").default} geometry Geometry. + * @param {import("../geom/Geometry.js").default|import("../render/Feature.js").default} geometry Geometry. * @param {import("../style/Style.js").default} style Style. * @param {import("../Feature.js").FeatureLike} feature Feature. */ From 1e90ffacec133b52167b59a3325ff67a87354904 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 16 Oct 2018 09:20:20 -0600 Subject: [PATCH 3/4] Avoid spread operator to fix TypeScript errors --- src/ol/format/filter/And.js | 3 +-- src/ol/format/filter/LogicalNary.js | 4 ++-- src/ol/format/filter/Or.js | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ol/format/filter/And.js b/src/ol/format/filter/And.js index 209191f8ef..ccb63c397e 100644 --- a/src/ol/format/filter/And.js +++ b/src/ol/format/filter/And.js @@ -15,8 +15,7 @@ class And extends LogicalNary { * @param {...import("./Filter.js").default} conditions Conditions. */ constructor(conditions) { - const params = ['And'].concat(Array.prototype.slice.call(arguments)); - super(...params); + super('And', Array.prototype.slice.call(arguments)); } } diff --git a/src/ol/format/filter/LogicalNary.js b/src/ol/format/filter/LogicalNary.js index c97759f2e2..d785e411b9 100644 --- a/src/ol/format/filter/LogicalNary.js +++ b/src/ol/format/filter/LogicalNary.js @@ -15,7 +15,7 @@ class LogicalNary extends Filter { /** * @param {!string} tagName The XML tag name for this filter. - * @param {...import("./Filter.js").default} conditions Conditions. + * @param {Array} conditions Conditions. */ constructor(tagName, conditions) { @@ -24,7 +24,7 @@ class LogicalNary extends Filter { /** * @type {Array} */ - this.conditions = Array.prototype.slice.call(arguments, 1); + this.conditions = conditions; assert(this.conditions.length >= 2, 57); // At least 2 conditions are required. } diff --git a/src/ol/format/filter/Or.js b/src/ol/format/filter/Or.js index 9500c89d0f..545ad4d196 100644 --- a/src/ol/format/filter/Or.js +++ b/src/ol/format/filter/Or.js @@ -14,8 +14,7 @@ class Or extends LogicalNary { * @param {...import("./Filter.js").default} conditions Conditions. */ constructor(conditions) { - const params = ['Or'].concat(Array.prototype.slice.call(arguments)); - super(...params); + super('Or', Array.prototype.slice.call(arguments)); } } From 49a4bf42480bf9866d32c888357bcfbd95a3be0b Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Tue, 16 Oct 2018 09:24:00 -0600 Subject: [PATCH 4/4] Fix TypeScript error in ol/control/OverviewMap --- src/ol/control/OverviewMap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index 9c496034f2..79faf74add 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -204,7 +204,8 @@ class OverviewMap extends Control { }; const move = function(event) { - const coordinates = ovmap.getEventCoordinate(computeDesiredMousePosition(event)); + const position = /** @type {?} */ (computeDesiredMousePosition(event)); + const coordinates = ovmap.getEventCoordinate(/** @type {Event} */ (position)); overlay.setPosition(coordinates); };