From 0471e66edc5a3a6fc8141324cc98e4c66d804db3 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sat, 25 Mar 2023 22:35:12 -0400 Subject: [PATCH] Start work on share page --- web-frontend/src/lib/Map.svelte | 2 -- web-frontend/src/routes/app/+page.svelte | 1 - .../src/routes/app/CoordinateInfo.svelte | 21 ++++++++++++++++++- xpin-wasm/src/lib.rs | 17 ++++++++------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/web-frontend/src/lib/Map.svelte b/web-frontend/src/lib/Map.svelte index ee03b98..96d9163 100644 --- a/web-frontend/src/lib/Map.svelte +++ b/web-frontend/src/lib/Map.svelte @@ -19,10 +19,8 @@ } if (locationChecked) { - console.log('Starting location'); map.locate({ setView: true, watch: true, enableHighAccuracy: true }); } else { - console.log('Stopping location'); map.stopLocate(); } }; diff --git a/web-frontend/src/routes/app/+page.svelte b/web-frontend/src/routes/app/+page.svelte index 7eb3f31..08c7754 100644 --- a/web-frontend/src/routes/app/+page.svelte +++ b/web-frontend/src/routes/app/+page.svelte @@ -137,7 +137,6 @@ selectedCoordinateType = coordinateTypes[addr.srcCoordsType] || selectedCoordinateType; coordinateInputValue = addr.srcCoordsRepr || coordinateInputValue; } else { - console.log('Getting it in the format of', selectedCoordinateType); coordinateInputValue = addr.get_coords_repr_as( coordinateTypes.indexOf(selectedCoordinateType) ); diff --git a/web-frontend/src/routes/app/CoordinateInfo.svelte b/web-frontend/src/routes/app/CoordinateInfo.svelte index 51f5993..62f4ec0 100644 --- a/web-frontend/src/routes/app/CoordinateInfo.svelte +++ b/web-frontend/src/routes/app/CoordinateInfo.svelte @@ -1,5 +1,24 @@ -Hi there +

DD

+

{xpin.allCoordinates.dd}

+ +

DMS

+

{xpin.allCoordinates.dms}

+ +

DMM

+

{xpin.allCoordinates.dmm}

+ +

UTM

+

{xpin.allCoordinates.utm}

+ +

PLUS

+

{xpin.allCoordinates.plus}

diff --git a/xpin-wasm/src/lib.rs b/xpin-wasm/src/lib.rs index 61f896f..09c06de 100644 --- a/xpin-wasm/src/lib.rs +++ b/xpin-wasm/src/lib.rs @@ -42,6 +42,7 @@ impl From for CoordinateType { } #[wasm_bindgen(getter_with_clone)] +#[derive(Debug)] pub struct EncodedAddress { pub address: String, /// The coordinates used to encode this address @@ -171,12 +172,12 @@ impl TryFrom<&'_ Address<'_>> for EncodedAddress { } } -// #[cfg(test)] -// mod tests { -// use super::*; +#[cfg(test)] +mod tests { + use super::*; -// #[test] -// fn test_general() { -// super::from_address("6532 BROADCAST TINY apple") -// } -// } + #[test] + fn test_general() { + // panic!("{:#?}", EncodedAddress::from_lat_lon(50.0, 20.0)); + } +}