diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-08-05 15:49:00 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:59:49 +0300 |
| commit | 6d911ac640c237f6c184be7c2233a067dec6ac6e (patch) | |
| tree | c3d8406840784dd078bf41844b3ee0c3c49f1b9d /map | |
| parent | cc846ea6f0c483e105ee976b0b4fe25992e8a89c (diff) | |
Setting length units for TTS in core. Removing unnecessary cpp getters.
Diffstat (limited to 'map')
| -rw-r--r-- | map/framework.cpp | 7 | ||||
| -rw-r--r-- | map/framework.hpp | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index b865277175..8d1558280b 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1616,6 +1616,13 @@ MapStyle Framework::GetMapStyle() const void Framework::SetupMeasurementSystem() { + Settings::Units units = Settings::Metric; + Settings::Get("Units", units); + LOG(LDEBUG, ("Units =", units)); + m_routingSession.SetTurnNotificationsUnits(units == Settings::Foot ? + routing::turns::sound::LengthUnits::Feet : + routing::turns::sound::LengthUnits::Meters); + m_informationDisplay.measurementSystemChanged(); Invalidate(); } diff --git a/map/framework.hpp b/map/framework.hpp index 8f49ae66c2..a42fb82ad0 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -582,14 +582,6 @@ public: // Sound notifications for turn instructions. inline void EnableTurnNotifications(bool enable) { m_routingSession.EnableTurnNotifications(enable); } inline bool AreTurnNotificationsEnabled() const { return m_routingSession.AreTurnNotificationsEnabled(); } - inline void SetTurnNotificationsUnits(routing::turns::sound::LengthUnits const & units) - { - m_routingSession.SetTurnNotificationsUnits(units); - } - inline routing::turns::sound::LengthUnits GetTurnNotificationsUnits() const - { - return m_routingSession.GetTurnNotificationsUnits(); - } inline void SetTurnNotificationsLocale(string const & locale) { m_routingSession.SetTurnNotificationsLocale(locale); } inline string GetTurnNotificationsLocale() const { return m_routingSession.GetTurnNotificationsLocale(); } |