From 9be403c7eba5b7953c0c3c1cbc14693ddfaa85b6 Mon Sep 17 00:00:00 2001
From: Austen Adler <agadler@austenadler.com>
Date: Thu, 27 Apr 2023 21:22:31 -0400
Subject: [PATCH] Improve url format definition

---
 web-frontend/src/lib/common.js                | 15 +++++++++++
 web-frontend/src/routes/app/+page.svelte      | 25 ++++++++++++-------
 .../src/routes/app/CoordinateInfo.svelte      | 12 +--------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/web-frontend/src/lib/common.js b/web-frontend/src/lib/common.js
index 8962149..3bdcd2e 100644
--- a/web-frontend/src/lib/common.js
+++ b/web-frontend/src/lib/common.js
@@ -1,6 +1,21 @@
 import init from 'xpin-wasm';
 import * as xpinWasm from 'xpin-wasm';
 
+export function rustEnumToArray(e) {
+	let ret = [];
+	for (let k in e) {
+		// Add the string coordinate types
+		if (!isNaN(k * 1)) {
+			// This is a numeric key, not a string key
+			// So skip it
+			continue;
+		}
+
+		ret.push(k);
+	}
+	return ret;
+}
+
 export const WasmStatus = {
 	NotLoaded: -1,
 	Loaded: 0,
diff --git a/web-frontend/src/routes/app/+page.svelte b/web-frontend/src/routes/app/+page.svelte
index 5f7327e..d58e48f 100644
--- a/web-frontend/src/routes/app/+page.svelte
+++ b/web-frontend/src/routes/app/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { getWasm } from '$lib/common.js';
+	import { getWasm, rustEnumToArray } from '$lib/common.js';
 	import { WasmStatus } from '$lib/common.js';
 	import { tick, onMount, onDestroy } from 'svelte';
 	import AddressInput from '$lib/AddressInput.svelte';
@@ -25,6 +25,17 @@
 
 	let initSuccess = false;
 	let coordinateTypes = [];
+	let urlFormats = [
+		'google_maps',
+		'google_maps_satellite',
+		'geo',
+		'openstreetmap',
+		'waze',
+		'apple_maps',
+		'osmand',
+		'bing_maps',
+		'osmand_direct'
+	];
 	let selectedCoordinateType;
 	let leaflet;
 	import Map from '$lib/Map.svelte';
@@ -60,15 +71,11 @@
 		await getWasm()
 			.then((w) => {
 				wasm = w;
-				for (let k in wasm.call.CoordinateType) {
-					// Add the string coordinate types
-					if (!isNaN(k * 1)) {
-						continue;
-					}
 
-					coordinateTypes.push(k);
-				}
+				coordinateTypes = rustEnumToArray(wasm.call.CoordinateType);
 				selectedCoordinateType = coordinateTypes[0];
+
+				console.log('My url formats: ', urlFormats, wasm.call.CoordinateUrls);
 			})
 			.then(async () => {
 				leaflet = await import('leaflet');
@@ -193,7 +200,7 @@
 	<TabSelector bind:tabInfo />
 
 	{#if tabInfo.selected === 1}
-		<CoordinateInfo bind:coordinateTypes bind:xpin={addr} />
+		<CoordinateInfo bind:coordinateTypes bind:urlFormats bind:xpin={addr} />
 	{/if}
 {:catch message}
 	<Error {message}>Could not start core module</Error>
diff --git a/web-frontend/src/routes/app/CoordinateInfo.svelte b/web-frontend/src/routes/app/CoordinateInfo.svelte
index 4437891..3ef8503 100644
--- a/web-frontend/src/routes/app/CoordinateInfo.svelte
+++ b/web-frontend/src/routes/app/CoordinateInfo.svelte
@@ -4,17 +4,7 @@
 
 	export let xpin;
 	export let coordinateTypes;
-
-	let urlFormats = [
-		'google_maps',
-		'geo',
-		'openstreetmap',
-		'waze',
-		'apple_maps',
-		'osmand',
-		'bing_maps',
-		'osmand_direct'
-	];
+	export let urlFormats;
 
 	// const shareClicked = (url) => {
 	// 	if (navigator.share) {