partially revert 966dee41f0

back to spelling of meter
This commit is contained in:
Matthias Wirth
2022-04-09 07:46:06 +02:00
parent 9ceecda94a
commit cde2e6e8db
3 changed files with 17 additions and 17 deletions

View File

@@ -163,7 +163,7 @@ function format_onground (alt) {
// alt in feet
function convert_altitude(alt, displayUnits) {
if (displayUnits === "metric") {
return alt * 0.3048; // feet to metres
return alt * 0.3048; // feet to meters
}
return alt;
@@ -195,7 +195,7 @@ function format_speed_long(speed, displayUnits) {
// speed in knots
function convert_speed(speed, displayUnits) {
if (displayUnits === "metric") {
return speed * 1.852; // knots to kilometres per hour
return speed * 1.852; // knots to kilometers per hour
}
else if (displayUnits === "imperial") {
return speed * 1.151; // knots to miles per hour
@@ -204,7 +204,7 @@ function convert_speed(speed, displayUnits) {
return speed;
}
// dist in metres
// dist in meters
function format_distance_brief(dist, displayUnits) {
if (dist == null) {
return "";
@@ -213,7 +213,7 @@ function format_distance_brief(dist, displayUnits) {
return convert_distance(dist, displayUnits).toFixed(1);
}
// dist in metres
// dist in meters
function format_distance_long(dist, displayUnits, fixed) {
if (dist == null) {
return "n/a";
@@ -238,24 +238,24 @@ function format_distance_short (dist, displayUnits) {
return dist_text;
}
// dist in metres
// dist in meters
function convert_distance(dist, displayUnits) {
if (displayUnits === "metric") {
return (dist / 1000); // metres to kilometres
return (dist / 1000); // meters to kilometres
}
else if (displayUnits === "imperial") {
return (dist / 1609); // metres to miles
return (dist / 1609); // meters to miles
}
return (dist / 1852); // metres to nautical miles
return (dist / 1852); // meters to nautical miles
}
// dist in metres
// converts metres to feet or just returns metres
// dist in meters
// converts meters to feet or just returns metres
function convert_distance_short(dist, displayUnits) {
if (displayUnits === "imperial") {
return (dist / 0.3048); // metres to feet
return (dist / 0.3048); // meters to feet
}
return dist; // just metres
return dist; // just meters
}
// rate in ft/min