rasmus/flyradar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Respect Metric/Imperial unit setting in radar range button, ring labels, aircraft list, nearest airport, and stats

Browse Source 
Five places ignored the Units setting (Menu > Units) and always showed
fixed metric values even when Imperial was selected: the radar range
button (now km/nm), the radar's ring distance labels (now km/nm), the
aircraft list's altitude/distance columns (now m+km or ft+nm), the
Location Presets screen's nearest-airport distance (now km/nm), and
the Stats screen's highest-altitude-today line (now m or ft). The
range button had already been touched previously but used "mi"
instead of "nm" - aligned to nm here for consistency with the other
distance displays, which all pair with km rather than miles.

The radar detail panel's simultaneous multi-unit display and the
climb/descent rate (always ft/min, aviation convention) are
intentionally left unchanged.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Eiswolf-BG
2026-08-11 23:49:45 +02:00
parent bb7eb10cc8
commit 64b58a3c5d
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/aircraft_list_screen.cpp
View File

@@ -9,6 +9,8 @@
#include "menu_stars.h"
#include "config.h"
#include "i18n.h"
#include "units.h"
#include "location_manager.h"
#include <algorithm>
#include <cstring>
@@ -124,6 +126,11 @@ bool run(TFT_eSPI& tft) {
Rect rowRects[ROWS_VISIBLE];
uint8_t visibleRowCount = 0;
// Einheiten-Einstellung (Menue > Einheiten) einmal vor der Schleife
// lesen statt pro Zeile - vorher zeigten Hoehe/Distanz hier immer
// fest ft/km, auch bei Imperial eingestellt.
bool listMetric = LocationManager::useMetricUnits();
if (count == 0) {
tft.setTextColor(TFT_DARKGREY, TFT_BLACK);
tft.setCursor(10, LIST_TOP + 14);
@@ -154,12 +161,20 @@ bool run(TFT_eSPI& tft) {
tft.drawString(label, r.x + 6, midY);
char buf[24];
snprintf(buf, sizeof(buf), "%.0fft", (float)a.altBaroFt);
if (listMetric) {
snprintf(buf, sizeof(buf), "%.0fm", Units::feetToMeters((float)a.altBaroFt));
} else {
snprintf(buf, sizeof(buf), "%.0fft", (float)a.altBaroFt);
}
tft.setTextColor(colorForAltitude(a.altBaroFt), TFT_BLACK);
tft.setTextDatum(MR_DATUM);
tft.drawString(buf, r.x + r.w - 62, midY);
snprintf(buf, sizeof(buf), "%.0fkm", a.distanceKm);
if (listMetric) {
snprintf(buf, sizeof(buf), "%.0fkm", a.distanceKm);
} else {
snprintf(buf, sizeof(buf), "%.0fnm", Units::kmToNm(a.distanceKm));
}
tft.setTextColor(TFT_GREEN, TFT_BLACK);
tft.setTextDatum(MR_DATUM);
tft.drawString(buf, r.x + r.w - 6, midY);