ISSUE #1106 #1096: Improve combined activity charts

Author: robiningelbrecht

src/Domain/Activity/Stream/CombinedStream/CalculateCombinedStreams/CalculateCombinedStreamsCommandHandler.php

@@ -98,6 +98,14 @@ public function handle(Command $command): void
                 $distanceInKm = Meter::from($row[$distanceIndex])->toKilometer();
                 $row[$distanceIndex] = $distanceInKm->toFloat();
 
+                if (UnitSystem::IMPERIAL === $this->unitSystem) {
+                    $row[$distanceIndex] = $distanceInKm->toMiles()->toFloat();
+                }
+
+                if (false !== $altitudeIndex && UnitSystem::IMPERIAL === $this->unitSystem) {
+                    $row[$altitudeIndex] = Meter::from($row[$altitudeIndex])->toFoot()->toFloat();
+                }
+
                 if (false !== $paceIndex) {
                     $secondsPerKilometer = MetersPerSecond::from($row[$paceIndex])->toSecPerKm();
                     if (UnitSystem::IMPERIAL === $this->unitSystem) {
@@ -118,13 +126,6 @@ public function handle(Command $command): void
                     }
                 }
 
-                if (UnitSystem::IMPERIAL === $this->unitSystem) {
-                    $row[$distanceIndex] = $distanceInKm->toMiles()->toFloat();
-                    if (false !== $altitudeIndex) {
-                        $row[$altitudeIndex] = Meter::from($row[$altitudeIndex])->toFoot()->toFloat();
-                    }
-                }
-
                 // Apply rounding rules.
                 $row[$distanceIndex] = match ($activityType) {
                     ActivityType::RIDE => $row[$distanceIndex] < 1 ? round($row[$distanceIndex], 1) : round($row[$distanceIndex]),