ui/map_eta: round remaining km/mi to one decimal place (#31968)

round distance
old-commit-hash: 9315d0e7a5
pull/32199/head
Dean Lee 1 year ago committed by GitHub
parent 41dd424762
commit f70c38c2df
  1. 8
      selfdrive/ui/qt/maps/map_helpers.cc

@ -137,17 +137,17 @@ std::optional<QMapLibre::Coordinate> coordinate_from_param(const std::string &pa
// return {distance, unit} // return {distance, unit}
std::pair<QString, QString> map_format_distance(float d, bool is_metric) { std::pair<QString, QString> map_format_distance(float d, bool is_metric) {
auto round_distance = [](float d) -> float { auto round_distance = [](float d) -> QString {
return (d > 10) ? std::nearbyint(d) : std::nearbyint(d * 10) / 10.0; return (d > 10) ? QString::number(std::nearbyint(d)) : QString::number(std::nearbyint(d * 10) / 10.0, 'f', 1);
}; };
d = std::max(d, 0.0f); d = std::max(d, 0.0f);
if (is_metric) { if (is_metric) {
return (d > 500) ? std::pair{QString::number(round_distance(d / 1000)), QObject::tr("km")} return (d > 500) ? std::pair{round_distance(d / 1000), QObject::tr("km")}
: std::pair{QString::number(50 * std::nearbyint(d / 50)), QObject::tr("m")}; : std::pair{QString::number(50 * std::nearbyint(d / 50)), QObject::tr("m")};
} else { } else {
float feet = d * METER_TO_FOOT; float feet = d * METER_TO_FOOT;
return (feet > 500) ? std::pair{QString::number(round_distance(d * METER_TO_MILE)), QObject::tr("mi")} return (feet > 500) ? std::pair{round_distance(d * METER_TO_MILE), QObject::tr("mi")}
: std::pair{QString::number(50 * std::nearbyint(d / 50)), QObject::tr("ft")}; : std::pair{QString::number(50 * std::nearbyint(d / 50)), QObject::tr("ft")};
} }
} }

Loading…
Cancel
Save