Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change literals to convert degrees into radians #8

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Change literals to convert degrees into radians #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37de5a
Change literals to convert degrees into radians
MichaelKutzner Aug 27, 2024
32681b5
Remove conversion literals
MichaelKutzner Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/geo/rad_deg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@ namespace geo {
constexpr double to_rad(double const deg) { return deg * kPI / 180.0; }
constexpr double to_deg(double const rad) { return rad * 180.0 / kPI; }

inline double operator""_rad(long double const deg) { return to_rad(static_cast<double>(deg)); }
inline double operator""_deg(long double const rad) { return to_deg(static_cast<double>(rad)); }

} // namespace geo
6 changes: 3 additions & 3 deletions src/latlng.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ latlng closest_on_segment(latlng const& x, latlng const& segment_from,

assert(!std::isnan(start_angle) && !std::isnan(end_angle));

if (start_angle >= 90.0_rad) {
if (start_angle >= to_rad(90.0)) {
return segment_from;
} else if (end_angle <= 90.0_rad) {
} else if (end_angle <= to_rad(90.0)) {
return segment_to;
} else {
// law of sines
auto const beta = 90.0_rad - start_angle;
auto const beta = to_rad(90.0) - start_angle;
auto const seg_offset = start_vec.length() * std::sin(beta);
return merc_to_latlng(merc_from + seg_offset * seg_dir.normalize());
}
Expand Down
9 changes: 6 additions & 3 deletions test/latlng_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,26 @@ TEST_CASE("destination_point") {
auto constexpr distance1 = 111800.0;
auto constexpr bearing1 = 0.0;
auto constexpr destination1_exp = geo::latlng{41.00555556, -20.0};
auto const destination1_act = geo::destination_point(source1, distance1, bearing1);
auto const destination1_act =
geo::destination_point(source1, distance1, bearing1);
CHECK(destination1_act.lat_ == doctest::Approx(destination1_exp.lat_));
CHECK(destination1_act.lng_ == doctest::Approx(destination1_exp.lng_));

auto constexpr source2 = geo::latlng{-23.0, 42.0};
auto constexpr distance2 = 2342000.0;
auto constexpr bearing2 = 90.0;
auto constexpr destination2_exp = geo::latlng{-21.38472222, 64.70277777};
auto const destination2_act = geo::destination_point(source2, distance2, bearing2);
auto const destination2_act =
geo::destination_point(source2, distance2, bearing2);
CHECK(destination2_act.lat_ == doctest::Approx(destination2_exp.lat_));
CHECK(destination2_act.lng_ == doctest::Approx(destination2_exp.lng_));

auto constexpr source3 = geo::latlng{89.0, 3.0};
auto constexpr distance3 = 11111000.0;
auto constexpr bearing3 = 77.0;
auto constexpr destination3_exp = geo::latlng{-9.69722222, 106.16833333};
auto const destination3_act = geo::destination_point(source3, distance3, bearing3);
auto const destination3_act =
geo::destination_point(source3, distance3, bearing3);
CHECK(destination3_act.lat_ == doctest::Approx(destination3_exp.lat_));
CHECK(destination3_act.lng_ == doctest::Approx(destination3_exp.lng_));
}
Loading