From 824d2b01316b4c373f6d814b4be8543d41d555ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 20:02:13 +0000 Subject: [PATCH 1/4] Bump typescript from 4.2.4 to 4.3.2 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.4 to 4.3.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.2.4...v4.3.2) Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index bedaa20983..f3b2a74fc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10562,9 +10562,9 @@ } }, "node_modules/typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -19747,9 +19747,9 @@ } }, "typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true }, "ua-parser-js": { From f61c502700d89c0250a2f77a3ea6ca2be9e09e0b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 31 May 2021 14:24:41 -0600 Subject: [PATCH 2/4] Correct type for success callback --- src/ol/featureloader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js index 26ef3be66b..5eed20a2f8 100644 --- a/src/ol/featureloader.js +++ b/src/ol/featureloader.js @@ -136,7 +136,7 @@ export function xhr(url, format) { * @param {import("./extent.js").Extent} extent Extent. * @param {number} resolution Resolution. * @param {import("./proj/Projection.js").default} projection Projection. - * @param {function(): void} [success] Success + * @param {function(Array): void} [success] Success * Function called when loading succeeded. * @param {function(): void} [failure] Failure * Function called when loading failed. From 05f1da24d738d052ea4f5f656c849680976fb80a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 31 May 2021 14:25:01 -0600 Subject: [PATCH 3/4] Mark origin as optional --- src/ol/format/KML.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index e2c9e0dd2a..977a6dce3f 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -60,7 +60,7 @@ import {transformGeometryWithOptions} from './Feature.js'; * @property {import("../style/IconAnchorUnits").default} xunits Units of x. * @property {number} y Y coordinate. * @property {import("../style/IconAnchorUnits").default} yunits Units of Y. - * @property {import("../style/IconOrigin.js").default} origin Origin. + * @property {import("../style/IconOrigin.js").default} [origin] Origin. */ /** From 9a38b3fc1c32e67043ee931114b5196ed4fa89bc Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 31 May 2021 14:25:21 -0600 Subject: [PATCH 4/4] Cast layer to base vector type --- src/ol/renderer/Composite.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ol/renderer/Composite.js b/src/ol/renderer/Composite.js index 40e56e37eb..f2a60c9afa 100644 --- a/src/ol/renderer/Composite.js +++ b/src/ol/renderer/Composite.js @@ -128,7 +128,9 @@ class CompositeMapRenderer extends MapRenderer { previousElement = element; } if ('getDeclutter' in layer) { - declutterLayers.push(layer); + declutterLayers.push( + /** @type {import("../layer/BaseVector.js").default} */ (layer) + ); } } for (let i = declutterLayers.length - 1; i >= 0; --i) {