From e5604463f6376b9fd4d443e72d117dda0bb99dd4 Mon Sep 17 00:00:00 2001
From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
Date: Fri, 14 Apr 2017 18:51:09 +0200
Subject: [PATCH 1/3] Prepare UI for new data

---
 Main.qml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Main.qml b/Main.qml
index 9fe9c3d..9af019a 100644
--- a/Main.qml
+++ b/Main.qml
@@ -536,13 +536,22 @@ MainView {
                         Column {
                             Label {
                                 text: "Time"
-                                //fontSize: "large"
+                                fontSize: "small"
                             }
                             Label {
                                 text: timestring
-                                fontSize: "x-large"
+                                fontSize: "large"
                                 //text: "00:00"
                             }
+                            Label {
+                                text: "Speed"
+                                fontSize: "small"
+                            }
+                            Label {
+                                id: speedlabel
+                                text: "No data"
+                                fontSize: "large"
+                            }
                         }
 
                         Button {
@@ -584,25 +593,27 @@ MainView {
                         Column {
                             Label {
                                 text: "Distance"
+                                fontSize: "small"
                             }
                             Label {
                                 id: distlabel
                                 text: "0"
-                                fontSize: "x-large"
+                                fontSize: "large"
+                            }
+                            Label {
+                                text: "Altitude"
+                                fontSize: "small"
+                            }
+                            Label {
+                                id: altlabel
+                                text: "No data"
+                                fontSize: "large"
                             }
                         }
 
                     }
                 }//Item (buttons)
 
-
-
-
-
-
-
-
-
             }//Bottom component page
 
         }//Page

From 59eee8a1c680536f48f9d7fc921ded5d9d9f4b22 Mon Sep 17 00:00:00 2001
From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
Date: Fri, 14 Apr 2017 20:07:54 +0200
Subject: [PATCH 2/3] Display raw data

---
 Main.qml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Main.qml b/Main.qml
index 9af019a..2fcb882 100644
--- a/Main.qml
+++ b/Main.qml
@@ -392,6 +392,16 @@ MainView {
                                 console.warn("========================")
                                 //console.warn(pygpx.current_distance(gpxx))
                             }
+                            if (src.position.altitudeValid) {
+                                altlabel.text = coord.altitude + " m"
+                            } else {
+                                altlabel.text = "No data"
+                            }
+                            if (src.position.speedValid) {
+                                speedlabel.text = src.position.speed + " m/s"
+                            } else {
+                                speedlabel.text = "No data"
+                            }
                         }
                     }
                 }

From 6b310df343a8cdb972ed132e7114586ddf28d00f Mon Sep 17 00:00:00 2001
From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
Date: Sun, 16 Apr 2017 22:13:49 +0200
Subject: [PATCH 3/3] Format distance and speed

Avoid raw values but format them in a more clean way.
---
 Main.qml | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/Main.qml b/Main.qml
index 2fcb882..b4ea68f 100644
--- a/Main.qml
+++ b/Main.qml
@@ -66,6 +66,36 @@ MainView {
         return result
     }
 
+    function formatDist(distance) {
+        if (runits == "miles"){
+            var mi
+            mi = distance * 0.62137 / 1000
+            distance = mi.toFixed(2) + "mi"
+        }
+        else if (runits == "kilometers"){
+            if (distance > 1000){
+                distance = distance / 1000
+                distance = distance.toFixed(2) + "km"
+            }
+            else
+                distance = distance + "m"
+        }
+        return distance
+    }
+
+    function formatSpeed(speed) {
+        if (runits == "miles"){
+            var mi
+            mi = speed * 0.62137 / 1000 * 3600
+            speed = mi.toFixed(2) + "mi/h"
+        }
+        else if (runits == "kilometers"){
+            speed = speed / 1000 * 3600
+            speed = speed.toFixed(2) + "km/h"
+        }
+        return speed
+    }
+
     ListModel {
         id: listModel
     }
@@ -393,12 +423,12 @@ MainView {
                                 //console.warn(pygpx.current_distance(gpxx))
                             }
                             if (src.position.altitudeValid) {
-                                altlabel.text = coord.altitude + " m"
+                                altlabel.text = formatDist(coord.altitude)
                             } else {
                                 altlabel.text = "No data"
                             }
                             if (src.position.speedValid) {
-                                speedlabel.text = src.position.speed + " m/s"
+                                speedlabel.text = formatSpeed(src.position.speed)
                             } else {
                                 speedlabel.text = "No data"
                             }