feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

feat: quantity_point construction from quantity made private + make_quantity_point added

Browse Source
This commit is contained in:
Mateusz Pusz
2023-08-23 12:49:14 +02:00
parent ed279c43ab
commit fb9f288c56
6 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/glide_computer.cpp
+2 -2
View File
@@ -67,8 +67,8 @@ auto get_waypoints()
using namespace geographic::literals;
using namespace mp_units::international::unit_symbols;
static const std::array waypoints = {
waypoint{"EPPR", {54.24772_N, 18.6745_E}, msl_altitude{16. * ft}}, // N54°14'51.8" E18°40'28.2"
waypoint{"EPGI", {53.52442_N, 18.84947_E}, msl_altitude{115. * ft}} // N53°31'27.9" E18°50'58.1"
waypoint{"EPPR", {54.24772_N, 18.6745_E}, mean_sea_level + 16. * ft}, // N54°14'51.8" E18°40'28.2"
waypoint{"EPGI", {53.52442_N, 18.84947_E}, mean_sea_level + 115. * ft} // N53°31'27.9" E18°50'58.1"
};
return waypoints;
}
example/unmanned_aerial_vehicle.cpp
+7 -7
View File
@@ -98,7 +98,7 @@ hae_altitude<M> to_hae(msl_altitude msl, position<long double> pos)
{
const auto geoid_undulation =
isq::height(GeographicLibWhatsMyOffset(pos.lat.number_in(si::degree), pos.lon.number_in(si::degree)) * si::metre);
return hae_altitude<M>{msl.absolute() - geoid_undulation};
return height_above_ellipsoid<M> + (msl.absolute() - geoid_undulation);
}
@@ -130,7 +130,7 @@ struct MP_UNITS_STD_FMT::formatter<hal_altitude> : formatter<hal_altitude::quant
// **** UAV ****
class unmanned_aerial_vehicle {
msl_altitude current_{0 * si::metre};
msl_altitude current_ = mean_sea_level + 0 * si::metre;
msl_altitude launch_ = current_;
public:
void take_off(msl_altitude alt) { launch_ = alt; }
@@ -139,7 +139,7 @@ public:
void current(msl_altitude alt) { current_ = alt; }
msl_altitude current() const { return current_; }
hal_altitude hal() const { return hal_altitude{current_ - launch_}; }
hal_altitude hal() const { return height_above_launch + (current_ - launch_); }
};
@@ -149,11 +149,11 @@ int main()
using namespace mp_units::international::unit_symbols;
unmanned_aerial_vehicle uav;
uav.take_off(msl_altitude{6'000 * ft});
uav.current(msl_altitude{10'000 * ft});
uav.take_off(mean_sea_level + 6'000 * ft);
uav.current(mean_sea_level + 10'000 * ft);
std::cout << MP_UNITS_STD_FMT::format("hal = {}\n", uav.hal());
msl_altitude ground_level{123 * m};
msl_altitude ground_level = mean_sea_level + 123 * m;
std::cout << MP_UNITS_STD_FMT::format("agl = {}\n", uav.current() - ground_level);
struct waypoint {
@@ -162,7 +162,7 @@ int main()
msl_altitude msl_alt;
};
waypoint wpt = {"EPPR", {54.24772_N, 18.6745_E}, msl_altitude{16. * ft}};
waypoint wpt = {"EPPR", {54.24772_N, 18.6745_E}, mean_sea_level + 16. * ft};
std::cout << MP_UNITS_STD_FMT::format("{}: {} {}, {:%.2Q %q}, {:%.2Q %q}\n", wpt.name, wpt.pos.lat, wpt.pos.lon,
wpt.msl_alt, to_hae<earth_gravity_model::egm2008_1>(wpt.msl_alt, wpt.pos));
}