From 02c705de36b51e424e5ff889a7c4d53f254a7a00 Mon Sep 17 00:00:00 2001 From: James Lyne Date: Thu, 29 Jul 2021 03:39:28 +0100 Subject: [PATCH] Fix build errors --- src/components/map/layer/PlayersLayer.vue | 4 ++-- src/components/sidebar/PlayerList.vue | 4 ++-- src/index.d.ts | 1 - src/store/state.ts | 1 - src/util/areas.ts | 2 +- src/util/circles.ts | 2 +- src/util/lines.ts | 2 +- src/util/paths.ts | 4 ++-- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/components/map/layer/PlayersLayer.vue b/src/components/map/layer/PlayersLayer.vue index e47dc4f..61fb450 100644 --- a/src/components/map/layer/PlayersLayer.vue +++ b/src/components/map/layer/PlayersLayer.vue @@ -68,12 +68,12 @@ export default defineComponent({ this.leaflet.getLayerManager().addLayer( this.layerGroup, true, - store.state.components.playerMarkers.layerName, + store.state.components.playerMarkers!.layerName, this.componentSettings!.layerPriority); } else { this.leaflet.getLayerManager().addHiddenLayer( this.layerGroup, - store.state.components.playerMarkers.layerName, + store.state.components.playerMarkers!.layerName, this.componentSettings!.layerPriority); } }, diff --git a/src/components/sidebar/PlayerList.vue b/src/components/sidebar/PlayerList.vue index 5399a14..6aea61d 100644 --- a/src/components/sidebar/PlayerList.vue +++ b/src/components/sidebar/PlayerList.vue @@ -51,8 +51,8 @@ export default defineComponent({ const store = useStore(), messageHeading = computed(() => { return store.state.messages.playersHeading - .replace('{cur}', players.value.length) - .replace('{max}', maxPlayers.value); + .replace('{cur}', players.value.length.toString()) + .replace('{max}', maxPlayers.value.toString()); }), messageSkeletonPlayers = computed(() => store.state.messages.playersSkeleton), messageSkeletonPlayersSearch = computed(() => store.state.messages.playersSearchSkeleton), diff --git a/src/index.d.ts b/src/index.d.ts index d91686c..23446d5 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -244,7 +244,6 @@ interface LiveAtlasServerConfig { followMap?: string; followZoom?: number; title: string; - grayHiddenPlayers: boolean; expandUI: boolean; } diff --git a/src/store/state.ts b/src/store/state.ts index d519f96..102ad1d 100644 --- a/src/store/state.ts +++ b/src/store/state.ts @@ -99,7 +99,6 @@ export const state: State = { followMap: '', followZoom: 0, title: '', - grayHiddenPlayers: false, expandUI: false, }, configurationHash: undefined, diff --git a/src/util/areas.ts b/src/util/areas.ts index 0c6e15e..4ed4639 100644 --- a/src/util/areas.ts +++ b/src/util/areas.ts @@ -33,7 +33,7 @@ export const createArea = (options: LiveAtlasArea, converter: Function): LiveAtl } if (options.tooltipContent) { - area.bindTooltip(() => options.tooltipContent, tooltipOptions); + area.bindTooltip(() => options.tooltipContent as string, tooltipOptions); } return area; diff --git a/src/util/circles.ts b/src/util/circles.ts index 1b48c80..d75253f 100644 --- a/src/util/circles.ts +++ b/src/util/circles.ts @@ -33,7 +33,7 @@ export const createCircle = (options: LiveAtlasCircle, converter: Function): Liv } if (options.tooltipContent) { - circle.bindTooltip(() => options.tooltipContent, tooltipOptions); + circle.bindTooltip(() => options.tooltipContent as string, tooltipOptions); } return circle; diff --git a/src/util/lines.ts b/src/util/lines.ts index 01f4dca..6d2de70 100644 --- a/src/util/lines.ts +++ b/src/util/lines.ts @@ -31,7 +31,7 @@ export const createLine = (options: LiveAtlasLine, converter: Function): LiveAtl } if (options.tooltipContent) { - line.bindTooltip(() => options.tooltipContent, tooltipOptions); + line.bindTooltip(() => options.tooltipContent as string, tooltipOptions); } return line; diff --git a/src/util/paths.ts b/src/util/paths.ts index 4b20503..df7d583 100644 --- a/src/util/paths.ts +++ b/src/util/paths.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {LatLngExpression, PathOptions} from "leaflet"; +import {Direction, LatLngExpression, PathOptions} from "leaflet"; import {LiveAtlasPath} from "@/index"; export const tooltipOptions = { - direction: 'top', + direction: 'top' as Direction, sticky: true, opacity: 1.0, interactive: false,