[geometry] LatLon refactoring.

9 files changed, 16 insertions, 16 deletions

diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index 9c8890b3b4..12bba3440c 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -572,8 +572,8 @@ Bookmark * BookmarkManager::CreateBookmark(kml::BookmarkData && bm, kml::MarkGro
   auto const latLon = MercatorBounds::ToLatLon(bm.m_point);
   alohalytics::TStringMap details{
     {"action", "create"},
-    {"lat", strings::to_string(latLon.lat)},
-    {"lon", strings::to_string(latLon.lon)},
+    {"lat", strings::to_string(latLon.m_lat)},
+    {"lon", strings::to_string(latLon.m_lon)},
     {"tags", ss.str()}};
   alohalytics::Stats::Instance().LogEvent("Bookmarks_Bookmark_action", details);
 
diff --git a/map/discovery/discovery_manager.cpp b/map/discovery/discovery_manager.cpp
index 546a2fc69e..efb5905378 100644
--- a/map/discovery/discovery_manager.cpp
+++ b/map/discovery/discovery_manager.cpp
@@ -48,7 +48,7 @@ std::string Manager::GetLocalExpertsUrl(m2::PointD const & point) const
 {
   ms::LatLon const ll(MercatorBounds::ToLatLon(point));
   std::ostringstream os;
-  os << locals::Api::GetLocalsPageUrl() << "?lat=" << ll.lat << "&lon=" << ll.lon;
+  os << locals::Api::GetLocalsPageUrl() << "?lat=" << ll.m_lat << "&lon=" << ll.m_lon;
   return os.str();
 }
 }  // namespace discovery
diff --git a/map/discovery/discovery_manager.hpp b/map/discovery/discovery_manager.hpp
index 4b3b5a5483..c6ea61ffc6 100644
--- a/map/discovery/discovery_manager.hpp
+++ b/map/discovery/discovery_manager.hpp
@@ -98,7 +98,7 @@ public:
         auto const latLon = MercatorBounds::ToLatLon(params.m_viewportCenter);
         auto constexpr pageNumber = 1;
         m_localsApi.GetLocals(
-            latLon.lat, latLon.lon, params.m_lang, params.m_itemsCount, pageNumber,
+            latLon.m_lat, latLon.m_lon, params.m_lang, params.m_itemsCount, pageNumber,
             [this, requestId, onResult](uint64_t id, std::vector<locals::LocalExpert> const & locals,
                                         size_t /* pageNumber */, size_t /* countPerPage */,
                                         bool /* hasPreviousPage */, bool /* hasNextPage */) {
diff --git a/map/framework.cpp b/map/framework.cpp
index edcf2828f2..6f0480f733 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1478,7 +1478,7 @@ void Framework::EnterBackground()
   alohalytics::Stats::Instance().LogEvent("Framework::EnterBackground", {{"zoom", strings::to_string(GetDrawScale())},
                                           {"foregroundSeconds", strings::to_string(
                                            static_cast<int>(m_startBackgroundTime - m_startForegroundTime))}},
-                                          alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+                                          alohalytics::Location::FromLatLon(ll.m_lat, ll.m_lon));
   // Do not clear caches for Android. This function is called when main activity is paused,
   // but at the same time search activity (for example) is enabled.
   // TODO(AlexZ): Use onStart/onStop on Android to correctly detect app background and remove #ifndef.
@@ -2442,7 +2442,7 @@ void Framework::OnTapEvent(TapEvent const & tapEvent)
 
       // Older version of statistics used "$GetUserMark" event.
       alohalytics::Stats::Instance().LogEvent("$SelectMapObject", kv,
-                                              alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+                                              alohalytics::Location::FromLatLon(ll.m_lat, ll.m_lon));
 
       if (info.GetSponsoredType() == SponsoredType::Booking)
       {
@@ -2644,7 +2644,7 @@ string Framework::GenerateApiBackUrl(ApiMarkPoint const & point) const
   if (!res.empty())
   {
     ms::LatLon const ll = point.GetLatLon();
-    res += "pin?ll=" + strings::to_string(ll.lat) + "," + strings::to_string(ll.lon);
+    res += "pin?ll=" + strings::to_string(ll.m_lat) + "," + strings::to_string(ll.m_lon);
     if (!point.GetName().empty())
       res += "&n=" + UrlEncode(point.GetName());
     if (!point.GetApiID().empty())
diff --git a/map/map_tests/gps_track_collection_test.cpp b/map/map_tests/gps_track_collection_test.cpp
index 9fca7caa0f..df25178d53 100644
--- a/map/map_tests/gps_track_collection_test.cpp
+++ b/map/map_tests/gps_track_collection_test.cpp
@@ -14,8 +14,8 @@ location::GpsTrackInfo MakeGpsTrackInfo(double timestamp, ms::LatLon const & ll,
   location::GpsTrackInfo info;
   info.m_timestamp = timestamp;
   info.m_speed = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   return info;
 }
 
diff --git a/map/map_tests/gps_track_storage_test.cpp b/map/map_tests/gps_track_storage_test.cpp
index 59b11dc8a9..c9c4e9460d 100644
--- a/map/map_tests/gps_track_storage_test.cpp
+++ b/map/map_tests/gps_track_storage_test.cpp
@@ -22,8 +22,8 @@ location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double speed)
   location::GpsInfo info;
   info.m_timestamp = timestamp;
   info.m_speedMpS = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   info.m_source = location::EAndroidNative;
   return info;
 }
diff --git a/map/map_tests/gps_track_test.cpp b/map/map_tests/gps_track_test.cpp
index 5b1117c4bf..bc09db261a 100644
--- a/map/map_tests/gps_track_test.cpp
+++ b/map/map_tests/gps_track_test.cpp
@@ -23,8 +23,8 @@ inline location::GpsInfo Make(double timestamp, ms::LatLon const & ll, double sp
   location::GpsInfo info;
   info.m_timestamp = timestamp;
   info.m_speedMpS = speed;
-  info.m_latitude = ll.lat;
-  info.m_longitude = ll.lon;
+  info.m_latitude = ll.m_lat;
+  info.m_longitude = ll.m_lon;
   info.m_horizontalAccuracy = 15;
   info.m_source = location::EAndroidNative;
   return info;
diff --git a/map/map_tests/mwm_url_tests.cpp b/map/map_tests/mwm_url_tests.cpp
index 31b3d1abb4..fa9a25f4ef 100644
--- a/map/map_tests/mwm_url_tests.cpp
+++ b/map/map_tests/mwm_url_tests.cpp
@@ -65,7 +65,7 @@ public:
   bool TestLatLon(int index, double lat, double lon) const
   {
     ms::LatLon const ll = GetMark(index)->GetLatLon();
-    return base::AlmostEqualULPs(ll.lat, lat) && base::AlmostEqualULPs(ll.lon, lon);
+    return base::AlmostEqualULPs(ll.m_lat, lat) && base::AlmostEqualULPs(ll.m_lon, lon);
   }
 
   bool TestRoutePoint(int index, double lat, double lon, string const & name)
diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp
index 8ef05c1f24..d92cede182 100644
--- a/map/place_page_info.cpp
+++ b/map/place_page_info.cpp
@@ -264,8 +264,8 @@ void Info::SetTitlesForBookmark()
 string Info::GetFormattedCoordinate(bool isDMS) const
 {
   auto const & ll = GetLatLon();
-  return isDMS ? measurement_utils::FormatLatLon(ll.lat, ll.lon, true)
-               : measurement_utils::FormatLatLonAsDMS(ll.lat, ll.lon, 2);
+  return isDMS ? measurement_utils::FormatLatLon(ll.m_lat, ll.m_lon, true)
+               : measurement_utils::FormatLatLonAsDMS(ll.m_lat, ll.m_lon, 2);
 }
 
 float Info::GetRatingRawValue() const