[geometry] LatLon refactoring.

5 files changed, 8 insertions, 8 deletions

diff --git a/track_analyzing/track_analyzer/cmd_cpp_track.cpp b/track_analyzing/track_analyzer/cmd_cpp_track.cpp
index 3f4553cefb..15058e9214 100644
--- a/track_analyzing/track_analyzer/cmd_cpp_track.cpp
+++ b/track_analyzing/track_analyzer/cmd_cpp_track.cpp
@@ -24,7 +24,7 @@ void CmdCppTrack(string const & trackFile, string const & mwmName, string const
   cout.precision(8);
   for (MatchedTrackPoint const & point : track)
   {
-    cout << "  {" << point.GetDataPoint().m_latLon.lat << ", " << point.GetDataPoint().m_latLon.lon
+    cout << "  {" << point.GetDataPoint().m_latLon.m_lat << ", " << point.GetDataPoint().m_latLon.m_lon
          << "}," << endl;
   }
   cout.precision(backupPrecision);
diff --git a/track_analyzing/track_analyzer/cmd_gpx.cpp b/track_analyzing/track_analyzer/cmd_gpx.cpp
index ac129a43e0..6b2a623b53 100644
--- a/track_analyzing/track_analyzer/cmd_gpx.cpp
+++ b/track_analyzing/track_analyzer/cmd_gpx.cpp
@@ -50,9 +50,9 @@ void CmdGPX(string const & logFile, string const & outputDirName, string const &
       for (auto const & point : track.second)
       {
         ofs << "<wpt lat=\""
-            << point.m_latLon.lat
+            << point.m_latLon.m_lat
             << "\" lon=\""
-            << point.m_latLon.lon << "\">"
+            << point.m_latLon.m_lon << "\">"
             << "</wpt>\n";
       }
 
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp
index d14439f6ae..6bf853f934 100644
--- a/track_analyzing/track_analyzer/cmd_table.cpp
+++ b/track_analyzing/track_analyzer/cmd_table.cpp
@@ -202,7 +202,7 @@ public:
   MoveType(RoadInfo const & roadType, traffic::SpeedGroup speedGroup, DataPoint const & dataPoint)
     : m_roadInfo(roadType), m_speedGroup(speedGroup), m_latLon(dataPoint.m_latLon)
   {
-    m_isDayTime = DayTimeToBool(GetDayTime(dataPoint.m_timestamp, m_latLon.lat, m_latLon.lon));
+    m_isDayTime = DayTimeToBool(GetDayTime(dataPoint.m_timestamp, m_latLon.m_lat, m_latLon.m_lon));
   }
 
   bool operator==(MoveType const & rhs) const
@@ -234,7 +234,7 @@ public:
     ostringstream out;
     out << m_roadInfo.GetSummary() << ","
         << m_isDayTime << ","
-        << m_latLon.lat << " " << m_latLon.lon;
+        << m_latLon.m_lat << " " << m_latLon.m_lon;
 
     return out.str();
   }
diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/track_analyzing/track_analyzer/cmd_tracks.cpp
index b2d9236171..d1a87f9d90 100644
--- a/track_analyzing/track_analyzer/cmd_tracks.cpp
+++ b/track_analyzing/track_analyzer/cmd_tracks.cpp
@@ -185,8 +185,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
                << ", departure: " << base::SecondsSinceEpochToString(start.m_timestamp)
                << ", arrival: " << base::SecondsSinceEpochToString(finish.m_timestamp)
                << setprecision(numeric_limits<double>::max_digits10)
-               << ", start: " << start.m_latLon.lat << ", " << start.m_latLon.lon
-               << ", finish: " << finish.m_latLon.lat << ", " << finish.m_latLon.lon << endl;
+               << ", start: " << start.m_latLon.m_lat << ", " << start.m_latLon.m_lon
+               << ", finish: " << finish.m_latLon.m_lat << ", " << finish.m_latLon.m_lon << endl;
         }
 
         mwmStats.AddTracks(1);
diff --git a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp b/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
index ef96a6f4fa..48040144ba 100644
--- a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
+++ b/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
@@ -34,7 +34,7 @@ void CmdUnmatchedTracks(string const & logFile, string const & trackFileCsv)
     {
       ofs << numMwmIds->GetFile(kv.first).GetName() << sep << idTrack.first;
       for (auto const & pnt : idTrack.second)
-        ofs << sep << pnt.m_timestamp << sep << pnt.m_latLon.lat << sep << pnt.m_latLon.lon;
+        ofs << sep << pnt.m_timestamp << sep << pnt.m_latLon.m_lat << sep << pnt.m_latLon.m_lon;
       ofs << "\n";
     }
   }