From ad9af04e9edfe270683ff55e35a6641e93288e31 Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Sat, 24 Jul 2021 20:12:18 +0100
Subject: [PATCH] Rename world/map title to displayName

---
 src/components/sidebar/WorldListItem.vue | 4 ++--
 src/index.d.ts                           | 2 +-
 src/model/LiveAtlasMapDefinition.ts      | 6 +++---
 src/providers/DynmapMapProvider.ts       | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/sidebar/WorldListItem.vue b/src/components/sidebar/WorldListItem.vue
index ed105b7..5a28f6f 100644
--- a/src/components/sidebar/WorldListItem.vue
+++ b/src/components/sidebar/WorldListItem.vue
@@ -16,13 +16,13 @@
 
 <template>
 	<div class="world">
-		<span class="world__name" aria-hidden="true">{{ world.title }}</span>
+		<span class="world__name" aria-hidden="true">{{ world.displayName }}</span>
 		<div class="world__maps menu">
 			<template v-for="[key, map] in world.maps" :key="`${world.name}_${key}`">
 				<input :id="`${name}-${world.name}-${key}`" type="radio" :name="name"
 				       v-bind:value="[world.name,map.name]" v-model="currentMap"
 				       :aria-labelledby="`${name}-${world.name}-${key}-label`">
-				<label :id="`${name}-${world.name}-${key}-label`" class="map" :for="`${name}-${world.name}-${key}`" :title="`${world.title} - ${map.title}`">
+				<label :id="`${name}-${world.name}-${key}-label`" class="map" :for="`${name}-${world.name}-${key}`" :title="`${world.displayName} - ${map.displayName}`">
 					<SvgIcon :name="map.getIcon()"></SvgIcon>
 				</label>
 			</template>
diff --git a/src/index.d.ts b/src/index.d.ts
index 2f646dd..496abed 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -127,9 +127,9 @@ interface LiveAtlasSortedPlayers extends Array<LiveAtlasPlayer> {
 interface LiveAtlasWorldDefinition {
 	seaLevel: number;
 	name: string;
+	displayName: string;
 	dimension: LiveAtlasDimension;
 	protected: boolean;
-	title: string;
 	height: number;
 	center: Coordinate;
 	maps: Map<string, LiveAtlasMapDefinition>;
diff --git a/src/model/LiveAtlasMapDefinition.ts b/src/model/LiveAtlasMapDefinition.ts
index ed021ef..a116b2c 100644
--- a/src/model/LiveAtlasMapDefinition.ts
+++ b/src/model/LiveAtlasMapDefinition.ts
@@ -21,7 +21,7 @@ import {LiveAtlasProjection} from "@/model/LiveAtlasProjection";
 export interface LiveAtlasMapDefinitionOptions {
 	world: LiveAtlasWorldDefinition;
 	name: string;
-	title?: string;
+	displayName?: string;
 	icon?: string;
 	background?: string;
 	nightAndDay?: boolean;
@@ -40,7 +40,7 @@ export default class LiveAtlasMapDefinition {
 	readonly world: LiveAtlasWorldDefinition;
 	readonly name: string;
 	readonly icon?: string;
-	readonly title: string;
+	readonly displayName: string;
 	readonly background: string;
 	readonly nightAndDay: boolean;
 	readonly backgroundDay?: string;
@@ -57,7 +57,7 @@ export default class LiveAtlasMapDefinition {
 		this.world = options.world; //Ignore append_to_world here otherwise things break
 		this.name = options.name;
 		this.icon = options.icon || undefined;
-		this.title = options.title || '';
+		this.displayName = options.displayName || '';
 
 		this.background = options.background || '#000000';
 		this.nightAndDay = options.nightAndDay || false;
diff --git a/src/providers/DynmapMapProvider.ts b/src/providers/DynmapMapProvider.ts
index c5b8772..f0beb1f 100644
--- a/src/providers/DynmapMapProvider.ts
+++ b/src/providers/DynmapMapProvider.ts
@@ -96,12 +96,12 @@ export default class DynmapMapProvider extends MapProvider {
 			}
 
 			worlds.set(world.name, {
-				seaLevel: world.sealevel || 64,
 				name: world.name,
+				displayName: world.title || '',
 				dimension: worldType,
 				protected: world.protected || false,
-				title: world.title || '',
 				height: world.height || 256,
+				seaLevel: world.sealevel || 64,
 				center: {
 					x: world.center.x || 0,
 					y: world.center.y || 0,
@@ -132,7 +132,7 @@ export default class DynmapMapProvider extends MapProvider {
 					nightAndDay: map.nightandday || false,
 					prefix: map.prefix || '',
 					protected: map.protected || false,
-					title: map.title || '',
+					displayName: map.title || '',
 					mapToWorld: map.maptoworld || undefined,
 					worldToMap: map.worldtomap || undefined,
 					nativeZoomLevels: map.mapzoomout || 1,