From d4e08970a6628bb34e046a3ab74db33bd39c44bb Mon Sep 17 00:00:00 2001 From: James Lyne Date: Fri, 17 Jun 2022 13:52:44 +0100 Subject: [PATCH] Update typescript --- package-lock.json | 14 +++++++------- package.json | 2 +- src/leaflet/control/LiveAtlasLayerControl.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3e2df6..2b6f4f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "sass": "^1.52", "ts-jest": "^27.1.4", "ts-node": "^10.8.1", - "typescript": "^4.5", + "typescript": "^4.7", "vite": "2.9.12", "vite-plugin-svg-sprite-component": "^1.0", "vue-tsc": "0.37.9" @@ -9400,9 +9400,9 @@ } }, "node_modules/typescript": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", - "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -16781,9 +16781,9 @@ } }, "typescript": { - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", - "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index def4dff..3fd5709 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "sass": "^1.52", "ts-jest": "^27.1.4", "ts-node": "^10.8.1", - "typescript": "^4.5", + "typescript": "^4.7", "vite": "2.9.12", "vite-plugin-svg-sprite-component": "^1.0", "vue-tsc": "0.37.9" diff --git a/src/leaflet/control/LiveAtlasLayerControl.ts b/src/leaflet/control/LiveAtlasLayerControl.ts index b9880ae..952a15c 100644 --- a/src/leaflet/control/LiveAtlasLayerControl.ts +++ b/src/leaflet/control/LiveAtlasLayerControl.ts @@ -49,7 +49,7 @@ export class LiveAtlasLayerControl extends Control.Layers { constructor(baseLayers?: LayersObject, overlays?: LayersObject, options?: LayersOptions) { // noinspection JSUnusedGlobalSymbols - super(baseLayers, overlays, Object.assign(options, { + super(baseLayers, overlays, Object.assign(options || {}, { sortLayers: true, sortFunction: (layer1: Layer, layer2: Layer, name1: string, name2: string) => { const priority1 = this._layerPositions.get(layer1) || 0,