From d8ff878491e8d4cc0337f926ac369ea5eadee197 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Wed, 8 Dec 2021 21:16:33 -0700
Subject: [PATCH] wip

---
 src/app.rs               | 45 ++++++++++++++++++++--------------------
 src/{utils.rs => gpx.rs} |  4 ++--
 src/loader.rs            |  8 +++----
 src/main.rs              |  2 +-
 4 files changed, 29 insertions(+), 30 deletions(-)
 rename src/{utils.rs => gpx.rs} (92%)

diff --git a/src/app.rs b/src/app.rs
index 43fd6ce..3890cb0 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -14,33 +14,32 @@ impl Component for App {
 
     fn view(&self, _ctx: &Context<Self>) -> Html {
         html! {
-          <>
-            <h1>
-              <a href="/">{"gpx.thermokar.st"}</a>
-            </h1>
+            <>
+                <h1>
+                   <a href="/">{"gpx.thermokar.st"}</a>
+                </h1>
 
-            <p>
-              {"This client-side tool is for merging "}
-              <a href="https://www.topografix.com/gpx.asp">{"GPX files"}</a>
-              {". Please note, this has only been tested on GPX files produced by "}
-              <a href="https://www.garmin.com">{"Garmin"}</a>
-              {" and "}
-              <a href="https://www.strava.com">{"Strava"}</a>
-              {" - your mileage may vary."}
-            </p>
+                <p>
+                    {"This client-side tool is for merging "}
+                    <a href="https://www.topografix.com/gpx.asp">{"GPX files"}</a>
+                    {". "}
+                </p>
 
-            <Loader />
+                <Loader />
 
-            <hr/>
+                <hr/>
 
-            <p>
-              <small>
-                <a href="https://github.com/thermokarst/gpx-web-utils">
-                  {"https://github.com/thermokarst/gpx-web-utils"}
-                </a>
-              </small>
-            </p>
-          </>
+                <p>
+                    <small>{"source (public access): git://pingo.thermokar.st/gpx-web-utils"}</small>
+                    <small>
+                        {"Please note, this has only been tested on GPX files produced by "}
+                        <a href="https://www.garmin.com">{"Garmin"}</a>
+                        {" and "}
+                        <a href="https://www.strava.com">{"Strava"}</a>
+                        {" - your mileage may vary."}
+                    </small>
+                </p>
+            </>
         }
     }
 }
diff --git a/src/utils.rs b/src/gpx.rs
similarity index 92%
rename from src/utils.rs
rename to src/gpx.rs
index 23ded6f..0afb3ee 100644
--- a/src/utils.rs
+++ b/src/gpx.rs
@@ -2,7 +2,7 @@ use std::error::Error;
 use wasm_bindgen::prelude::*;
 use web_sys::Blob;
 
-fn join_gpx_files(files: &Vec<String>) -> Result<gpx::Gpx, Box<dyn Error>> {
+fn join_gpx_files(files: &[String]) -> Result<gpx::Gpx, Box<dyn Error>> {
     let mut merged_gpx: gpx::Gpx = Default::default();
     let mut merged_track: gpx::Track = gpx::Track::new();
 
@@ -51,7 +51,7 @@ fn write_gpx_to_buffer(gpx: gpx::Gpx) -> Result<js_sys::Array, Box<dyn Error>> {
     Ok(array)
 }
 
-pub fn merge(files: &Vec<String>) -> Result<Blob, Box<dyn Error>> {
+pub fn merge(files: &[String]) -> Result<Blob, Box<dyn Error>> {
     let merged: gpx::Gpx = join_gpx_files(files)?;
     let out_vec = write_gpx_to_buffer(merged)?;
     let result = Blob::new_with_u8_array_sequence(&out_vec).map_err(|e| e.as_string().unwrap())?;
diff --git a/src/loader.rs b/src/loader.rs
index 4d16a9f..1762c32 100644
--- a/src/loader.rs
+++ b/src/loader.rs
@@ -5,7 +5,7 @@ use gloo_file::File;
 use web_sys::{Event, HtmlInputElement, Url, MouseEvent};
 use yew::{html, html::TargetCast, Component, Context, Html};
 
-use super::utils;
+use super::gpx;
 
 pub enum Msg {
     FileLoaded(String, String),
@@ -52,7 +52,7 @@ impl Component for Loader {
             Msg::StartLoad(files) => {
                 self.count = files.len();
                 if self.count < 2 {
-                    utils::alert("must load two or more files");
+                    gpx::alert("must load two or more files");
                     ctx.link().send_message(Msg::Reset);
                     return true;
                 }
@@ -78,10 +78,10 @@ impl Component for Loader {
             }
 
             Msg::FilesLoaded => {
-                let merged = match utils::merge(&self.files) {
+                let merged = match gpx::merge(&self.files) {
                     Ok(result) => result,
                     Err(err) => {
-                        utils::alert(&err.to_string());
+                        gpx::alert(&err.to_string());
                         ctx.link().send_message(Msg::Reset);
                         return true
                     }
diff --git a/src/main.rs b/src/main.rs
index 434fbeb..508cb79 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@ extern crate wee_alloc;
 
 mod app;
 mod loader;
-mod utils;
+mod gpx;
 
 // Use `wee_alloc` as the global allocator.
 #[global_allocator]