From 48b94f6bfb3afc20ebcc6fe993dd4b59a6a85d6f Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Sun, 12 Sep 2021 20:37:59 +0100
Subject: [PATCH] Fix parseUrl issues

---
 src/util.ts | 68 +++++++++++++++++------------------------------------
 1 file changed, 22 insertions(+), 46 deletions(-)

diff --git a/src/util.ts b/src/util.ts
index f1a493b..16dd382 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -107,89 +107,65 @@ export const parseUrl = (url: URL) => {
 	const query = new URLSearchParams(url.search),
 		hash = url.hash.replace('#', '');
 
-	if(hash) {
-		try {
-			return parseMapHash(hash);
-		} catch (e) {
-			console.warn('Ignoring invalid url ' + e);
-		}
-	}
-
-	try {
-		return parseMapSearchParams(query);
-	} catch(e) {
-		console.warn('Ignoring invalid legacy url ' + e);
-	}
-
-	return null;
+	return hash ? parseMapHash(hash) : parseMapSearchParams(query);
 }
 
 export const parseMapHash = (hash: string) => {
 	const parts = hash.replace('#', '').split(';');
 
 	const world = parts[0] || undefined,
-		map = parts[1] || undefined;
-
-	let location = (parts[2] || '').split(',')
+		map = parts[1] || undefined,
+		location = (parts[2] || '').split(',')
 			.map(item => parseFloat(item))
 			.filter(item => !isNaN(item) && isFinite(item)),
 		zoom = typeof parts[3] !== 'undefined' ? parseInt(parts[3]) : undefined;
 
-	if(location.length && location.length !== 3) {
-		location = [];
-		console.warn('Ignoring invalid URL location');
-	}
-
-	if(typeof zoom !== 'undefined' && (isNaN(zoom) || zoom < 0 || !isFinite(zoom))) {
-		zoom = undefined;
-		console.warn('Ignoring invalid URL value for zoom');
-	}
-
-	return {
+	return validateParsedUrl({
 		world,
 		map,
-		location: location.length ? {
+		location: location.length === 3 ? {
 			x: location[0],
 			y: location[1],
 			z: location[2],
 		} : undefined,
 		zoom,
 		legacy: false,
-	}
+	});
 }
 
 export const parseMapSearchParams = (query: URLSearchParams) => {
 	const world = query.get('worldname') /* Dynmap */ || query.get('world') /* Pl3xmap */ || undefined,
-		map = query.get('mapname') || undefined;
-
-	let location = [
+		map = query.has('worldname') ? query.get('mapname') || undefined : undefined, //Dynmap only
+		location = [
 			query.get('x') || '',
 			query.get('y') || '64',
 			query.get('z') || ''
 		].map(item => parseFloat(item)).filter(item => !isNaN(item) && isFinite(item)),
 		zoom = query.has('zoom') ? parseInt(query.get('zoom') as string) : undefined;
 
-	if(location.length && location.length !== 3) {
-		location = [];
-		console.warn('Ignoring invalid URL location');
-	}
-
-	if(typeof zoom !== 'undefined' && (isNaN(zoom) || zoom < 0 || !isFinite(zoom))) {
-		zoom = undefined;
-		console.warn('Ignoring invalid URL value for zoom');
-	}
-
-	return {
+	return validateParsedUrl({
 		world,
 		map,
-		location: location.length ? {
+		location: location.length === 3 ? {
 			x: location[0],
 			y: location[1],
 			z: location[2],
 		} : undefined,
 		zoom,
 		legacy: true,
+	});
+}
+
+const validateParsedUrl = (parsed: any) => {
+	if(typeof parsed.zoom !== 'undefined' && (isNaN(parsed.zoom) || parsed.zoom < 0 || !isFinite(parsed.zoom))) {
+		parsed.zoom = undefined;
 	}
+
+	if(!parsed.world) {
+		return null;
+	}
+
+	return parsed;
 }
 
 export const getUrlForLocation = (map: LiveAtlasMapDefinition, location: {