[omim] Refactored measurement_utils.

3 files changed, 12 insertions, 11 deletions

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index a748bafa03..5eaf5ce5dd 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -608,8 +608,8 @@ Java_com_mapswithme_maps_Framework_nativeGetDistanceAndAzimuthFromLatLon(
 JNIEXPORT jobject JNICALL
 Java_com_mapswithme_maps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, jboolean useDMSFormat)
 {
-  return jni::ToJavaString(env, (useDMSFormat ? MeasurementUtils::FormatLatLonAsDMS(lat, lon, 2)
-                                              : MeasurementUtils::FormatLatLon(lat, lon, 6)));
+  return jni::ToJavaString(env, (useDMSFormat ? measurement_utils::FormatLatLonAsDMS(lat, lon, 2)
+                                              : measurement_utils::FormatLatLon(lat, lon, 6)));
 }
 
 JNIEXPORT jobjectArray JNICALL
@@ -617,9 +617,9 @@ Java_com_mapswithme_maps_Framework_nativeFormatLatLonToArr(JNIEnv * env, jclass,
 {
   string slat, slon;
   if (useDMSFormat)
-    MeasurementUtils::FormatLatLonAsDMS(lat, lon, slat, slon, 2);
+    measurement_utils::FormatLatLonAsDMS(lat, lon, slat, slon, 2);
   else
-    MeasurementUtils::FormatLatLon(lat, lon, slat, slon, 6);
+    measurement_utils::FormatLatLon(lat, lon, slat, slon, 6);
 
   static jclass const klass = jni::GetGlobalClassRef(env, "java/lang/String");
   jobjectArray arr = env->NewObjectArray(2, klass, 0);
@@ -633,13 +633,13 @@ Java_com_mapswithme_maps_Framework_nativeFormatLatLonToArr(JNIEnv * env, jclass,
 JNIEXPORT jobject JNICALL
 Java_com_mapswithme_maps_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt)
 {
-  return jni::ToJavaString(env,  MeasurementUtils::FormatAltitude(alt));
+  return jni::ToJavaString(env, measurement_utils::FormatAltitude(alt));
 }
 
 JNIEXPORT jobject JNICALL
 Java_com_mapswithme_maps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed)
 {
-  return jni::ToJavaString(env,  MeasurementUtils::FormatSpeed(speed));
+  return jni::ToJavaString(env, measurement_utils::FormatSpeedWithDeviceUnits(speed));
 }
 
 JNIEXPORT jobject JNICALL
diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
index 2dd767dc82..0aee2f1d02 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
@@ -106,7 +106,7 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkCategory_nativeGetTrack(
   ASSERT(nTrack, ("Track must not be null with index:)", bmkId));
 
   string formattedLength;
-  MeasurementUtils::FormatDistance(nTrack->GetLengthMeters(), formattedLength);
+  measurement_utils::FormatDistance(nTrack->GetLengthMeters(), formattedLength);
 
   dp::Color nColor = nTrack->GetColor(0);
 
diff --git a/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp b/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp
index 5aec8dd7cf..ad129e09ac 100644
--- a/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp
+++ b/android/jni/com/mapswithme/maps/settings/UnitLocale.cpp
@@ -1,14 +1,14 @@
 #include "../Framework.hpp"
 
+#include "platform/measurement_utils.hpp"
 #include "platform/settings.hpp"
 
-
 extern "C"
 {
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units)
   {
-    settings::Units const u = static_cast<settings::Units>(units);
+    measurement_utils::Units const u = static_cast<measurement_utils::Units>(units);
     settings::Set(settings::kMeasurementUnits, u);
     g_framework->SetupMeasurementSystem();
   }
@@ -16,7 +16,8 @@ extern "C"
   JNIEXPORT jint JNICALL
   Java_com_mapswithme_maps_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz)
   {
-    settings::Units u;
-    return (settings::Get(settings::kMeasurementUnits, u) ? u : -1);
+    measurement_utils::Units u;
+    return static_cast<jint>(
+        settings::Get(settings::kMeasurementUnits, u) ? u : measurement_utils::Units::Metric);
   }
 }