diff options
Diffstat (limited to 'routing/turns_sound_settings.hpp')
| -rw-r--r-- | routing/turns_sound_settings.hpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/routing/turns_sound_settings.hpp b/routing/turns_sound_settings.hpp index bf205a76e3..d533708563 100644 --- a/routing/turns_sound_settings.hpp +++ b/routing/turns_sound_settings.hpp @@ -2,7 +2,7 @@ #include "routing/turns.hpp" -#include "platform/settings.hpp" +#include "platform/measurement_utils.hpp" #include "std/vector.hpp" @@ -47,14 +47,14 @@ class Settings /// \brief m_distancesToPronounce is a list of distances in m_lengthUnits /// which are ready to be pronounced. vector<uint32_t> m_soundedDistancesUnits; - ::settings::Units m_lengthUnits; + measurement_utils::Units m_lengthUnits; // This constructor is for testing only. Settings(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits, uint32_t maxNotificationDistanceUnits, uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters, uint32_t minDistToSayNotificationMeters, vector<uint32_t> const & soundedDistancesUnits, - ::settings::Units lengthUnits) + measurement_utils::Units lengthUnits) : m_timeSeconds(notificationTimeSeconds) , m_minDistanceUnits(minNotificationDistanceUnits) , m_maxDistanceUnits(maxNotificationDistanceUnits) @@ -78,13 +78,14 @@ public: , m_minStartBeforeMeters(minStartBeforeMeters) , m_maxStartBeforeMeters(maxStartBeforeMeters) , m_minDistToSayNotificationMeters(minDistToSayNotificationMeters) - , m_lengthUnits(::settings::Metric) + , m_lengthUnits(measurement_utils::Units::Metric) { } void SetState(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits, uint32_t maxNotificationDistanceUnits, - vector<uint32_t> const & soundedDistancesUnits, ::settings::Units lengthUnits); + vector<uint32_t> const & soundedDistancesUnits, + measurement_utils::Units lengthUnits); /// \brief IsValid checks if Settings data is consistent. /// \warning The complexity is up to linear in size of m_soundedDistancesUnits. @@ -112,8 +113,8 @@ public: /// The result will be one of the m_soundedDistancesUnits values. uint32_t RoundByPresetSoundedDistancesUnits(uint32_t turnNotificationUnits) const; - inline ::settings::Units GetLengthUnits() const { return m_lengthUnits; } - inline void SetLengthUnits(::settings::Units units) { m_lengthUnits = units; } + inline measurement_utils::Units GetLengthUnits() const { return m_lengthUnits; } + inline void SetLengthUnits(measurement_utils::Units units) { m_lengthUnits = units; } double ConvertMetersPerSecondToUnitsPerSecond(double speedInMetersPerSecond) const; double ConvertUnitsToMeters(double distanceInUnits) const; double ConvertMetersToUnits(double distanceInMeters) const; @@ -133,15 +134,15 @@ struct Notification /// The word "Then" shall be pronounced intead of the distance. bool m_useThenInsteadOfDistance; TurnDirection m_turnDir; - ::settings::Units m_lengthUnits; + measurement_utils::Units m_lengthUnits; Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance, - TurnDirection turnDir, ::settings::Units lengthUnits) - : m_distanceUnits(distanceUnits), - m_exitNum(exitNum), - m_useThenInsteadOfDistance(useThenInsteadOfDistance), - m_turnDir(turnDir), - m_lengthUnits(lengthUnits) + TurnDirection turnDir, measurement_utils::Units lengthUnits) + : m_distanceUnits(distanceUnits) + , m_exitNum(exitNum) + , m_useThenInsteadOfDistance(useThenInsteadOfDistance) + , m_turnDir(turnDir) + , m_lengthUnits(lengthUnits) { } bool operator==(Notification const & rhv) const |