show current speed (reported by gps) on tracker page

Karry · Apr 7, 2024 · 62f1ac6 · 62f1ac6
1 parent a1c0898
commit 62f1ac6
Show file tree

Hide file tree

Showing 20 changed files with 1,217 additions and 1,124 deletions.
diff --git a/qml/custom/Global.qml b/qml/custom/Global.qml
@@ -201,6 +201,10 @@ Item {
         property bool altitudeValid: false
         property date lastAltitudeUpdate: new Date(0)
 
+        property double speed: -1
+        property bool speedValid: false
+        property date lastSpeedUpdate: new Date(0)
+
         property double verticalAccuracy: 0
         property bool verticalAccuracyValid: false
 
@@ -271,6 +275,11 @@ Item {
                 verticalAccuracy = position.verticalAccuracy;
                 verticalAccuracyValid = position.verticalAccuracyValid;
             }
+            if (position.speedValid){
+                speed = position.speed;
+                speedValid = true;
+                lastSpeedUpdate = lastUpdate;
+            }
 
             updateInternal();
         }

diff --git a/qml/pages/Tracker.qml b/qml/pages/Tracker.qml
@@ -250,7 +250,10 @@ Page {
                 value: qsTranslate("trackType", Global.tracker.type)
             }
 
-            SectionHeader{ text: qsTr("Current data") }
+            SectionHeader{
+                text: qsTr("Current data")
+                visible: Global.positionSource.lastUpdate.getTime() > 0
+            }
 
             DetailItem {
                 id: lastUpdateTime
@@ -259,6 +262,18 @@ Page {
                 label: qsTr("Last update")
                 value: Qt.formatTime(Global.positionSource.lastUpdate, Qt.DefaultLocaleLongDate)
             }
+            DetailItem {
+                id: currentSpeed
+                visible: Global.positionSource.lastUpdate.getTime() > 0
+                label: qsTr("Current speed")
+                value: (Global.positionSource.speedValid && ((Global.positionSource.lastUpdate.getTime() - Global.positionSource.lastSpeedUpdate.getTime()) < 10000)) ?
+                           (Utils.distanceUnits == "imperial" ?
+                               (qsTr("%1 mi/h")
+                                   .arg(content.round10((Global.positionSource.speed*3.6 * 1000) / 1609.344))) :
+                               (qsTr("%1 km/h")
+                                   .arg(content.round10(Global.positionSource.speed*3.6)))
+                            ) : "-"
+            }
             DetailItem {
                 id: lastHorizontalAccuracy
                 visible: lastUpdateTime.visible

diff --git a/rpm/harbour-osmscout.changes.in b/rpm/harbour-osmscout.changes.in
@@ -619,3 +619,4 @@
 * 2024-xx-xx Lukáš Karas <[email protected]> 2.34
 - fix map byte size formatting with some locales
 - improve night/day mode switching during navigation
+- show current speed (reported by gps) on tracker page
diff --git a/translations/cs.ts b/translations/cs.ts
@@ -1629,14 +1629,93 @@ collection pull down menu</extracomment>
 </context>
 <context>
     <name>Tracker</name>
+    <message>
+        <source>Edit track</source>
+        <translation>Upravit trasu</translation>
+    </message>
     <message>
         <source>New track</source>
         <translation>Nová trasa</translation>
     </message>
+    <message>
+        <source>You can return to the map, tracking will continue on background</source>
+        <translation>Můžete se vrátit na mapu, stopař bude pokračovat na pozadí</translation>
+    </message>
+    <message>
+        <source>Change color</source>
+        <translation>Změnit barvu</translation>
+    </message>
+    <message>
+        <source>Rename track</source>
+        <translation>Přejmenovat trasu</translation>
+    </message>
     <message>
         <source>Stop tracking</source>
         <translation>Zastavit stopaře</translation>
     </message>
+    <message>
+        <source>Stopping tracker</source>
+        <extracomment>remorse dialog</extracomment>
+        <translation>Zastavuji stopaře</translation>
+    </message>
+    <message numerus="yes">
+        <source>There was %n error(s) during tracking. Recent: %2</source>
+        <translation>
+            <numerusform>Nastala %n chyba během trackování. Poslední: %2</numerusform>
+            <numerusform>Nastaly %n chyby během trackování. Poslední: %2</numerusform>
+            <numerusform>Nastalo %n chyb během trackování. Poslední: %2</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>track type</extracomment>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Current data</source>
+        <translation>Současná data</translation>
+    </message>
+    <message>
+        <source>Last update</source>
+        <extracomment>Last GPS update time</extracomment>
+        <translation>Poslední aktualizace</translation>
+    </message>
+    <message>
+        <source>Current speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 mi/h</source>
+        <translation>%1 mi/h</translation>
+    </message>
+    <message>
+        <source>%1 km/h</source>
+        <translation>%1 km/h</translation>
+    </message>
+    <message>
+        <source>Horizontal accuracy</source>
+        <translation>Horizontální přesnost</translation>
+    </message>
+    <message>
+        <source>Altitude</source>
+        <translation>Nadmořská výška</translation>
+    </message>
+    <message>
+        <source>%1 ft a.s.l.</source>
+        <translation>%1 stop n.m.</translation>
+    </message>
+    <message>
+        <source>%1 m a.s.l.</source>
+        <translation>%1 m n.m.</translation>
+    </message>
+    <message>
+        <source>Vertical accuracy</source>
+        <translation>Vertikální přesnost</translation>
+    </message>
+    <message>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
+    </message>
     <message>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
@@ -1680,14 +1759,6 @@ collection pull down menu</extracomment>
         <source>Moving Speed ⌀</source>
         <translation>Rychlost v pohybu ⌀</translation>
     </message>
-    <message>
-        <source>%1 mi/h</source>
-        <translation>%1 mi/h</translation>
-    </message>
-    <message>
-        <source>%1 km/h</source>
-        <translation>%1 km/h</translation>
-    </message>
     <message>
         <source>Elevation min/max</source>
         <translation>Nadmořská výška min/max</translation>
@@ -1708,73 +1779,6 @@ collection pull down menu</extracomment>
         <source>Descent</source>
         <translation>Klesání</translation>
     </message>
-    <message>
-        <source>Stopping tracker</source>
-        <extracomment>remorse dialog</extracomment>
-        <translation>Zastavuji stopaře</translation>
-    </message>
-    <message>
-        <source>Current data</source>
-        <translation>Současná data</translation>
-    </message>
-    <message>
-        <source>Last update</source>
-        <extracomment>Last GPS update time</extracomment>
-        <translation>Poslední aktualizace</translation>
-    </message>
-    <message>
-        <source>Horizontal accuracy</source>
-        <translation>Horizontální přesnost</translation>
-    </message>
-    <message>
-        <source>Altitude</source>
-        <translation>Nadmořská výška</translation>
-    </message>
-    <message>
-        <source>%1 ft a.s.l.</source>
-        <translation>%1 stop n.m.</translation>
-    </message>
-    <message>
-        <source>%1 m a.s.l.</source>
-        <translation>%1 m n.m.</translation>
-    </message>
-    <message>
-        <source>Vertical accuracy</source>
-        <translation>Vertikální přesnost</translation>
-    </message>
-    <message>
-        <source>Statistics</source>
-        <translation>Statistika</translation>
-    </message>
-    <message numerus="yes">
-        <source>There was %n error(s) during tracking. Recent: %2</source>
-        <translation>
-            <numerusform>Nastala %n chyba během trackování. Poslední: %2</numerusform>
-            <numerusform>Nastaly %n chyby během trackování. Poslední: %2</numerusform>
-            <numerusform>Nastalo %n chyb během trackování. Poslední: %2</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Edit track</source>
-        <translation>Upravit trasu</translation>
-    </message>
-    <message>
-        <source>Rename track</source>
-        <translation>Přejmenovat trasu</translation>
-    </message>
-    <message>
-        <source>Change color</source>
-        <translation>Změnit barvu</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <extracomment>track type</extracomment>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>You can return to the map, tracking will continue on background</source>
-        <translation>Můžete se vrátit na mapu, stopař bude pokračovat na pozadí</translation>
-    </message>
 </context>
 <context>
     <name>Utils</name>