ISSUE #1106 #1096: Improve combined activity charts

robiningelbrecht · robiningelbrecht · commit 40b37538d83c · 2025-09-23T21:17:57.000+02:00
diff --git a/src/Domain/Activity/Stream/CombinedStream/CalculateCombinedStreams/CalculateCombinedStreamsCommandHandler.php b/src/Domain/Activity/Stream/CombinedStream/CalculateCombinedStreams/CalculateCombinedStreamsCommandHandler.php
@@ -99,12 +99,12 @@ public function handle(Command $command): void
                 $row[$distanceIndex] = $distanceInKm->toFloat();
 
                 if (false !== $paceIndex) {
-                    $kmPerHour = MetersPerSecond::from($row[$paceIndex])->toSecPerKm();
+                    $secondsPerKilometer = MetersPerSecond::from($row[$paceIndex])->toSecPerKm();
                     if (UnitSystem::IMPERIAL === $this->unitSystem) {
-                        $row[$paceIndex] = $kmPerHour->toSecPerMile()->toInt();
+                        $row[$paceIndex] = $secondsPerKilometer->toSecPerMile()->toInt();
                     }
                     if (UnitSystem::METRIC === $this->unitSystem) {
-                        $row[$paceIndex] = $kmPerHour->toInt();
+                        $row[$paceIndex] = $secondsPerKilometer->toInt();
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,12 @@ public function handle(Command $command): void`
`99`	`99`	`$row[$distanceIndex] = $distanceInKm->toFloat();`
`100`	`100`
`101`	`101`	`if (false !== $paceIndex) {`
`102`		`- $kmPerHour = MetersPerSecond::from($row[$paceIndex])->toSecPerKm();`
	`102`	`+ $secondsPerKilometer = MetersPerSecond::from($row[$paceIndex])->toSecPerKm();`
`103`	`103`	`if (UnitSystem::IMPERIAL === $this->unitSystem) {`
`104`		`- $row[$paceIndex] = $kmPerHour->toSecPerMile()->toInt();`
	`104`	`+ $row[$paceIndex] = $secondsPerKilometer->toSecPerMile()->toInt();`
`105`	`105`	`}`
`106`	`106`	`if (UnitSystem::METRIC === $this->unitSystem) {`
`107`		`- $row[$paceIndex] = $kmPerHour->toInt();`
	`107`	`+ $row[$paceIndex] = $secondsPerKilometer->toInt();`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`