Move mps to kph calculation to Go

Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
jovandeginste · Feb 28, 2024 · 4b64bf4 · 4b64bf4
1 parent cf87211
commit 4b64bf4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/pkg/database/user_statistics.go b/pkg/database/user_statistics.go
@@ -50,6 +50,18 @@ type (
 	}
 )
 
+func (t *Totals) AverageSpeedKPH() float64 {
+	return 3.6 * t.AverageSpeed
+}
+
+func (t *Totals) AverageSpeedNoPauseKPH() float64 {
+	return 3.6 * t.AverageSpeedNoPause
+}
+
+func (t *Totals) MaxSpeedKPH() float64 {
+	return 3.6 * t.MaxSpeed
+}
+
 func NewWorkoutStatistic(t WorkoutType) *WorkoutStatistic {
 	return &WorkoutStatistic{
 		WorkoutType: t,

diff --git a/pkg/database/workouts_statistics.go b/pkg/database/workouts_statistics.go
@@ -18,6 +18,10 @@ type StatisticsItem struct {
 	IsWorst       bool
 }
 
+func (si *StatisticsItem) SpeedKPH() float64 {
+	return 3.6 * si.Speed
+}
+
 func (si *StatisticsItem) createNext(fp *MapPoint) StatisticsItem {
 	return StatisticsItem{
 		Unit:          si.Unit,

diff --git a/views/user/user_statistics.html b/views/user/user_statistics.html
@@ -251,7 +251,7 @@ <h3 class="{{ IconFor `max-speed` }}">{{ i18n "Max speed" }}</h3>
                 data: [
                   {{ range $y, $yv := $stats.PerMonth -}}
                   {{- range $m, $mv := $yv -}}
-                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: 3.6 * {{ $mv.AverageSpeed }} },
+                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: {{ $mv.AverageSpeedKPH }} },
                   {{ end -}}
                   {{- end }}
                 ],
@@ -274,7 +274,7 @@ <h3 class="{{ IconFor `max-speed` }}">{{ i18n "Max speed" }}</h3>
                 data: [
                   {{ range $y, $yv := $stats.PerMonth -}}
                   {{- range $m, $mv := $yv -}}
-                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: 3.6 * {{ $mv.AverageSpeedNoPause }} },
+                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: {{ $mv.AverageSpeedNoPauseKPH }} },
                   {{ end -}}
                   {{- end }}
                 ],
@@ -297,7 +297,7 @@ <h3 class="{{ IconFor `max-speed` }}">{{ i18n "Max speed" }}</h3>
                 data: [
                   {{ range $y, $yv := $stats.PerMonth -}}
                   {{- range $m, $mv := $yv -}}
-                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: 3.6 * {{ $mv.MaxSpeed }} },
+                  { x: "{{ $y }}-{{ printf "%02d" $m }}", y: {{ $mv.MaxSpeedKPH }} },
                   {{ end -}}
                   {{- end }}
                 ],

diff --git a/views/workouts/workouts_show.html b/views/workouts/workouts_show.html
@@ -98,7 +98,7 @@ <h3 class="{{ IconFor `elevation` }}">{{ i18n "Elevation" }}</h3>
               label: "{{ i18n `Average speed` }}",
               data: [
                 {{ range $.workoutStatisticsPerMin -}}
-                  { "x": {{ .FirstPoint.Time }}, "y": 3.6 * {{ .Speed }}, },
+                  { "x": {{ .FirstPoint.Time }}, "y": {{ .SpeedKPH }}, },
                 {{- end  }}
               ],
             }],