Skip to content

Commit 23a02da

Browse files
committed
Revert "fix(apps): convert Driving Dynamics coach efficiency + distance to account units"
This reverts commit b3ba60d.
1 parent b3ba60d commit 23a02da

4 files changed

Lines changed: 9 additions & 64 deletions

File tree

apps/windows/TeslaSync.App.Core/Units/UnitConverters.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,4 @@ public static class UnitConverters
8787
PowerUnit.Kw => watts / 1000.0,
8888
_ => watts,
8989
};
90-
91-
/// <summary>
92-
/// Convert an energy-efficiency value from the backend-native Wh-per-kilometre (<c>efficiency_wh_km</c>)
93-
/// to the user's display distance unit. Efficiency per mile is larger than per km because a mile is
94-
/// longer: Wh/mi = Wh/km * (metres per mile / metres per km). Mirrors the web efficiency unit handling.
95-
/// </summary>
96-
public static double EfficiencyFromWhPerKm(double whPerKm, DistanceUnit to) => to switch
97-
{
98-
DistanceUnit.Mi => whPerKm * (MetersPerMile / MetersPerKm),
99-
_ => whPerKm,
100-
};
10190
}

apps/windows/TeslaSync.App.Core/Units/UnitPref.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ public static class UnitLabels
128128
_ => "W",
129129
};
130130

131-
/// <summary>The energy-efficiency unit label for a display distance unit (Wh/mi imperial, else Wh/km).</summary>
132-
public static string EfficiencyLabel(DistanceUnit u) => u == DistanceUnit.Mi ? "Wh/mi" : "Wh/km";
133-
134131
public static DistanceUnit DistanceFromLabel(string label) => label switch
135132
{
136133
"km" => DistanceUnit.Km,

apps/windows/TeslaSync.App.Tests/EfficiencyConverterTests.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

apps/windows/TeslaSync.App/feature-views/DrivingDynamicsPage/DrivingDynamicsPage.Projection.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static DrivingDynamicsDisplay Project(
115115
MotorCharts: BuildMotorCharts(snapshot.MotorHistory, localizer),
116116
Efficiency: BuildEfficiency(stats, units, localizer),
117117
Summary: BuildSummary(stats, units, localizer),
118-
Coach: BuildCoach(snapshot.Coach, units, localizer),
118+
Coach: BuildCoach(snapshot.Coach, localizer),
119119
Analytics: BuildAnalytics(filteredDrives, model.Range, units, localizer),
120120
Tips: BuildTips(stats, localizer),
121121
AutomationName: $"{title}. {subtitle}");
@@ -442,7 +442,7 @@ private static SummaryStatsDisplay BuildSummary(MotorStats? stats, UnitPref unit
442442
}
443443

444444
// ── 9. Driving Coach ─────────────────────────────────────────────────────────────────────────────────
445-
private static CoachDisplay BuildCoach(CoachData? coach, UnitPref units, ILocalizer l)
445+
private static CoachDisplay BuildCoach(CoachData? coach, ILocalizer l)
446446
{
447447
double score = coach?.OverallScore ?? 0;
448448
int total = coach?.TotalDrivesAnalyzed ?? 0;
@@ -451,7 +451,7 @@ private static CoachDisplay BuildCoach(CoachData? coach, UnitPref units, ILocali
451451
var weekly = BuildWeeklySeries(coach, l);
452452
var patterns = BuildPatterns(coach, l);
453453
var (recsHas, recs) = BuildRecommendations(coach, l);
454-
var (perHas, perRows) = BuildPerDrive(coach, units);
454+
var (perHas, perRows) = BuildPerDrive(coach);
455455

456456
return new CoachDisplay(
457457
l.GetString("dynamics.coach.title", "Driving Coach"),
@@ -465,9 +465,9 @@ private static CoachDisplay BuildCoach(CoachData? coach, UnitPref units, ILocali
465465
segments,
466466
rows,
467467
l.GetString("dynamics.coach.avgEfficiency", "Avg Efficiency"),
468-
$"{ScalarFormatters.FormatNumber(UnitConverters.EfficiencyFromWhPerKm(coach?.EfficiencyWhKm ?? 0, units.Distance), 0)} {UnitLabels.EfficiencyLabel(units.Distance)}",
468+
$"{ScalarFormatters.FormatNumber(coach?.EfficiencyWhKm ?? 0, 0)} Wh/km",
469469
l.GetString("dynamics.coach.bestEfficiency", "Best Efficiency"),
470-
$"{ScalarFormatters.FormatNumber(UnitConverters.EfficiencyFromWhPerKm(coach?.BestEfficiencyWhKm ?? 0, units.Distance), 0)} {UnitLabels.EfficiencyLabel(units.Distance)}",
470+
$"{ScalarFormatters.FormatNumber(coach?.BestEfficiencyWhKm ?? 0, 0)} Wh/km",
471471
l.GetString("dynamics.coach.weeklyTrend", "Weekly Score Trend"),
472472
(coach?.WeeklyTrend.Count ?? 0) > 1,
473473
l.GetString("dynamics.coach.needWeeks", "Need at least 2 weeks of data for trend analysis."),
@@ -485,7 +485,7 @@ private static CoachDisplay BuildCoach(CoachData? coach, UnitPref units, ILocali
485485
l.GetString("dynamics.coach.col.date", "Date"),
486486
l.GetString("dynamics.coach.col.score", "Score"),
487487
l.GetString("dynamics.coach.col.style", "Style"),
488-
UnitLabels.EfficiencyLabel(units.Distance),
488+
l.GetString("dynamics.coach.col.efficiency", "Wh/km"),
489489
l.GetString("dynamics.coach.col.distance", "Distance"),
490490
],
491491
perRows);
@@ -578,7 +578,7 @@ private static (bool, IReadOnlyList<CoachRecRow>) BuildRecommendations(CoachData
578578
return (true, rows);
579579
}
580580

581-
private static (bool, IReadOnlyList<CoachScoreRow>) BuildPerDrive(CoachData? coach, UnitPref units)
581+
private static (bool, IReadOnlyList<CoachScoreRow>) BuildPerDrive(CoachData? coach)
582582
{
583583
var scores = coach?.PerDriveScores ?? System.Array.Empty<CoachDriveScore>();
584584
if (scores.Count == 0)
@@ -603,8 +603,8 @@ private static (bool, IReadOnlyList<CoachScoreRow>) BuildPerDrive(CoachData? coa
603603
scoreStatus,
604604
s.Style,
605605
styleStatus,
606-
ScalarFormatters.FormatNumber(UnitConverters.EfficiencyFromWhPerKm(s.Efficiency, units.Distance), 0),
607-
$"{ScalarFormatters.FormatNumber(UnitConverters.DistanceFromSi(s.Distance * 1000.0, units.Distance), 0)} {UnitLabels.Label(units.Distance)}"));
606+
ScalarFormatters.FormatNumber(s.Efficiency, 0),
607+
$"{ScalarFormatters.FormatNumber(s.Distance, 0)} km"));
608608
}
609609

610610
return (true, rows);

0 commit comments

Comments
 (0)