mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-05 12:13:54 +00:00
Merge commit '211e3fb4' into traffic
# Conflicts: # android/app/src/main/cpp/CMakeLists.txt # android/app/src/main/java/app/organicmaps/sdk/util/Config.java # android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java # android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java # android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp # indexer/ftypes_matcher.hpp # iphone/Maps/Maps.xcodeproj/project.pbxproj
This commit is contained in:
@@ -36,12 +36,12 @@ double constexpr kAnglesInBucket = 360.0 / kNumBuckets;
|
||||
double ToAngleInDeg(uint32_t angleInBuckets)
|
||||
{
|
||||
CHECK_LESS_OR_EQUAL(angleInBuckets, 255, ());
|
||||
return base::Clamp(kAnglesInBucket * static_cast<double>(angleInBuckets), 0.0, 360.0);
|
||||
return math::Clamp(kAnglesInBucket * static_cast<double>(angleInBuckets), 0.0, 360.0);
|
||||
}
|
||||
|
||||
uint32_t BearingInDeg(m2::PointD const & a, m2::PointD const & b)
|
||||
{
|
||||
auto const angle = location::AngleToBearing(base::RadToDeg(ang::AngleTo(a, b)));
|
||||
auto const angle = location::AngleToBearing(math::RadToDeg(ang::AngleTo(a, b)));
|
||||
CHECK(0.0 <= angle && angle <= 360.0, (angle));
|
||||
return angle;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user