diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index ce57235b04..3f1a489945 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -670,8 +670,9 @@ 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 ? measurement_utils::FormatLatLonAsDMS(lat, lon, 2) - : measurement_utils::FormatLatLon(lat, lon, 6))); + return jni::ToJavaString(env, + (useDMSFormat ? measurement_utils::FormatLatLonAsDMS(lat, lon, 2) + : measurement_utils::FormatLatLon(lat, lon, true, 6))); } JNIEXPORT jobjectArray JNICALL diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 48d3053929..f591e7aeb3 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -138,6 +138,11 @@ string FormatLatLon(double lat, double lon, int dac) return to_string_dac(lat, dac) + " " + to_string_dac(lon, dac); } +string FormatLatLon(double lat, double lon, bool withSemicolon, int dac) +{ + return to_string_dac(lat, dac) + (withSemicolon ? ", " : " ") + to_string_dac(lon, dac); +} + void FormatLatLon(double lat, double lon, string & latText, string & lonText, int dac) { latText = to_string_dac(lat, dac); diff --git a/platform/measurement_utils.hpp b/platform/measurement_utils.hpp index 6a023bbb03..00a67a1754 100644 --- a/platform/measurement_utils.hpp +++ b/platform/measurement_utils.hpp @@ -52,6 +52,7 @@ void FormatMercatorAsDMS(m2::PointD const & mercator, string & lat, string & lon /// Default dac == 6 for the simple decimal formatting. string FormatLatLon(double lat, double lon, int dac = 6); +string FormatLatLon(double lat, double lon, bool withSemicolon, int dac = 6); void FormatLatLon(double lat, double lon, string & latText, string & lonText, int dac = 6); string FormatMercator(m2::PointD const & mercator, int dac = 6); void FormatMercator(m2::PointD const & mercator, string & lat, string & lon, int dac = 6);