Introduced the constant for measurement units in the settings.

7 files changed, 17 insertions, 14 deletions

diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp
index 8e6360cc52..755cd70608 100644
--- a/platform/measurement_utils.cpp
+++ b/platform/measurement_utils.cpp
@@ -49,7 +49,7 @@ bool FormatDistanceImpl(double m, string & res,
 bool FormatDistance(double m, string & res)
 {
   Units u = Metric;
-  (void)Get("Units", u);
+  (void)Get(Settings::kMeasurementUnits, u);
 
   /// @todo Put string units resources.
   switch (u)
@@ -152,7 +152,7 @@ void FormatMercator(m2::PointD const & mercator, string & lat, string & lon, int
 string FormatAltitude(double altitudeInMeters)
 {
   Units u = Metric;
-  (void)Get("Units", u);
+  (void)Get(Settings::kMeasurementUnits, u);
 
   ostringstream ss;
   ss << fixed << setprecision(0);
@@ -169,7 +169,7 @@ string FormatAltitude(double altitudeInMeters)
 string FormatSpeed(double metersPerSecond)
 {
   Units u = Metric;
-  (void)Get("Units", u);
+  (void)Get(Settings::kMeasurementUnits, u);
 
   double perHour;
   string res;
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index 01fd0980c2..4f0816535e 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -252,11 +252,11 @@ Platform::EError Platform::MkDir(string const & dirName) const
 void Platform::SetupMeasurementSystem() const
 {
   Settings::Units u;
-  if (Settings::Get("Units", u))
+  if (Settings::Get(Settings::kMeasurementUnits, u))
     return;
   // @TODO Add correct implementation
   u = Settings::Metric;
-  Settings::Set("Units", u);
+  Settings::Set(Settings::kMeasurementUnits, u);
 }
 
 namespace
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index ec0b8058e1..b7cafe738b 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -263,11 +263,11 @@ Platform::EConnectionType Platform::ConnectionStatus()
 void Platform::SetupMeasurementSystem() const
 {
   Settings::Units u;
-  if (Settings::Get("Units", u))
+  if (Settings::Get(Settings::kMeasurementUnits, u))
     return;
   BOOL const isMetric = [[[NSLocale autoupdatingCurrentLocale] objectForKey:NSLocaleUsesMetricSystem] boolValue];
   u = isMetric ? Settings::Metric : Settings::Foot;
-  Settings::Set("Units", u);
+  Settings::Set(Settings::kMeasurementUnits, u);
 }
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp
index 527426a485..42b0a1c588 100644
--- a/platform/platform_qt.cpp
+++ b/platform/platform_qt.cpp
@@ -75,11 +75,11 @@ Platform::EError Platform::MkDir(string const & dirName) const
 void Platform::SetupMeasurementSystem() const
 {
   Settings::Units u;
-  if (Settings::Get("Units", u))
+  if (Settings::Get(Settings::kMeasurementUnits, u))
     return;
   bool const isMetric = QLocale::system().measurementSystem() == QLocale::MetricSystem;
   u = isMetric ? Settings::Metric : Settings::Foot;
-  Settings::Set("Units", u);
+  Settings::Set(Settings::kMeasurementUnits, u);
 }
 
 #if defined(OMIM_OS_LINUX)
diff --git a/platform/platform_tests/measurement_tests.cpp b/platform/platform_tests/measurement_tests.cpp
index ca27c074b1..a1090031da 100644
--- a/platform/platform_tests/measurement_tests.cpp
+++ b/platform/platform_tests/measurement_tests.cpp
@@ -8,7 +8,7 @@ using namespace MeasurementUtils;
 
 UNIT_TEST(Measurement_Smoke)
 {
-  Settings::Set("Units", Settings::Metric);
+  Settings::Set(Settings::kMeasurementUnits, Settings::Metric);
 
   typedef pair<double, char const *> PairT;
 
@@ -66,15 +66,15 @@ UNIT_TEST(LatLonToDMS_NoRounding)
 
 UNIT_TEST(FormatAltitude)
 {
-  Settings::Set("Units", Settings::Foot);
+  Settings::Set(Settings::kMeasurementUnits, Settings::Foot);
   TEST_EQUAL(FormatAltitude(10000), "32808ft", ());
-  Settings::Set("Units", Settings::Metric);
+  Settings::Set(Settings::kMeasurementUnits, Settings::Metric);
   TEST_EQUAL(FormatAltitude(5), "5m", ());
 }
 
 UNIT_TEST(FormatSpeed)
 {
-  Settings::Set("Units", Settings::Metric);
+  Settings::Set(Settings::kMeasurementUnits, Settings::Metric);
   TEST_EQUAL(FormatSpeed(10), "36km/h", ());
   TEST_EQUAL(FormatSpeed(1), "3.6km/h", ());
 }
diff --git a/platform/settings.cpp b/platform/settings.cpp
index 0dfb5a4249..902a1d4232 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -25,6 +25,7 @@ char const DELIM_CHAR = '=';
 }
 
 char const * Settings::kLocationStateMode = "LastLocationStateMode";
+char const * Settings::kMeasurementUnits = "Units";
 
 namespace Settings
 {
diff --git a/platform/settings.hpp b/platform/settings.hpp
index 66dcbb261a..362332a4ea 100644
--- a/platform/settings.hpp
+++ b/platform/settings.hpp
@@ -6,8 +6,10 @@
 
 namespace Settings
 {
-// Current location state mode. @See location::EMyPositionMode.
+/// Current location state mode. @See location::EMyPositionMode.
 extern char const * kLocationStateMode;
+/// Metric or Feet.
+extern char const * kMeasurementUnits;
 
 template <class T>
 bool FromString(string const & str, T & outValue);