diff options
author | Maxim Pimenov <m@maps.me> | 2018-09-14 21:08:09 +0300 |
---|---|---|
committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-09-18 14:46:56 +0300 |
commit | 412387c84eefba2ec4c267ee2748bf78f03ce327 (patch) | |
tree | 8d79b6b480fb91a5458a21aec10ac689de54db9f /track_analyzing | |
parent | bef147b46fb8fd5160fc8e3b13f3548906ae5ef7 (diff) |
[base] Replaced the namespace my with base.
Diffstat (limited to 'track_analyzing')
-rw-r--r-- | track_analyzing/log_parser.cpp | 6 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_gpx.cpp | 2 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_match.cpp | 2 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_table.cpp | 2 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_track.cpp | 2 | ||||
-rw-r--r-- | track_analyzing/track_analyzer/cmd_tracks.cpp | 4 | ||||
-rw-r--r-- | track_analyzing/utils.cpp | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/track_analyzing/log_parser.cpp b/track_analyzing/log_parser.cpp index 709bea3455..9d6a52a54b 100644 --- a/track_analyzing/log_parser.cpp +++ b/track_analyzing/log_parser.cpp @@ -43,7 +43,7 @@ public: { numMwmIds.ForEachId([&](routing::NumMwmId numMwmId) { string const & mwmName = numMwmIds.GetFile(numMwmId).GetName(); - string const polyFile = my::JoinPath(dataDir, BORDERS_DIR, mwmName + BORDERS_EXTENSION); + string const polyFile = base::JoinPath(dataDir, BORDERS_DIR, mwmName + BORDERS_EXTENSION); osm::LoadBorders(polyFile, m_borders[numMwmId]); }); } @@ -95,7 +95,7 @@ void LogParser::Parse(string const & logFile, MwmToTracks & mwmToTracks) const void LogParser::ParseUserTracks(string const & logFile, UserToTrack & userToTrack) const { - my::Timer timer; + base::Timer timer; std::ifstream stream(logFile); if (!stream) @@ -142,7 +142,7 @@ void LogParser::ParseUserTracks(string const & logFile, UserToTrack & userToTrac void LogParser::SplitIntoMwms(UserToTrack const & userToTrack, MwmToTracks & mwmToTracks) const { - my::Timer timer; + base::Timer timer; PointToMwmId const pointToMwmId(m_mwmTree, *m_numMwmIds, m_dataDir); diff --git a/track_analyzing/track_analyzer/cmd_gpx.cpp b/track_analyzing/track_analyzer/cmd_gpx.cpp index 3c274cea2e..257d21f800 100644 --- a/track_analyzing/track_analyzer/cmd_gpx.cpp +++ b/track_analyzing/track_analyzer/cmd_gpx.cpp @@ -40,7 +40,7 @@ void CmdGPX(string const & logFile, string const & outputDirName, string const & if (!userID.empty() && track.first != userID) continue; - auto const path = my::JoinPath(outputDirName, mwmName + to_string(i) + ".gpx"); + auto const path = base::JoinPath(outputDirName, mwmName + to_string(i) + ".gpx"); ofstream ofs(path, ofstream::out); ofs << "<gpx>\n"; ofs << "<metadata>\n"; diff --git a/track_analyzing/track_analyzer/cmd_match.cpp b/track_analyzing/track_analyzer/cmd_match.cpp index 7ce446718c..6649c14afb 100644 --- a/track_analyzing/track_analyzer/cmd_match.cpp +++ b/track_analyzing/track_analyzer/cmd_match.cpp @@ -25,7 +25,7 @@ namespace void MatchTracks(MwmToTracks const & mwmToTracks, storage::Storage const & storage, NumMwmIds const & numMwmIds, MwmToMatchedTracks & mwmToMatchedTracks) { - my::Timer timer; + base::Timer timer; uint64_t tracksCount = 0; uint64_t pointsCount = 0; diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp index 584e3b3939..13401e024e 100644 --- a/track_analyzing/track_analyzer/cmd_table.cpp +++ b/track_analyzing/track_analyzer/cmd_table.cpp @@ -256,7 +256,7 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String } cout << mwmName << " " << user << " " << trackIdx << " " - << my::SecondsSinceEpochToString(start) << " " << length << " " << timeElapsed << " " + << base::SecondsSinceEpochToString(start) << " " << length << " " << timeElapsed << " " << speed << " " << aggregator.GetSummary() << endl; } } diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/track_analyzing/track_analyzer/cmd_track.cpp index 1791c627c2..f6d66b5320 100644 --- a/track_analyzing/track_analyzer/cmd_track.cpp +++ b/track_analyzing/track_analyzer/cmd_track.cpp @@ -69,7 +69,7 @@ void CmdTrack(string const & trackFile, string const & mwmName, string const & u if (elapsed != 0) speed = CalcSpeedKMpH(distance, elapsed); - LOG(LINFO, (my::SecondsSinceEpochToString(point.GetDataPoint().m_timestamp), + LOG(LINFO, (base::SecondsSinceEpochToString(point.GetDataPoint().m_timestamp), point.GetDataPoint().m_latLon, point.GetSegment(), ", traffic:", point.GetDataPoint().m_traffic, ", distance:", distance, ", elapsed:", elapsed, ", speed:", speed)); diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/track_analyzing/track_analyzer/cmd_tracks.cpp index b5e3dfa34d..c4010c2c45 100644 --- a/track_analyzing/track_analyzer/cmd_tracks.cpp +++ b/track_analyzing/track_analyzer/cmd_tracks.cpp @@ -183,8 +183,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil cout << fixed << setprecision(1) << " points: " << track.size() << ", length: " << length << ", duration: " << duration << ", estimated duration: " << estimatedDuration << ", speed: " << speed << ", traffic: " << hasTrafficPoints - << ", departure: " << my::SecondsSinceEpochToString(start.m_timestamp) - << ", arrival: " << my::SecondsSinceEpochToString(finish.m_timestamp) + << ", 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; diff --git a/track_analyzing/utils.cpp b/track_analyzing/utils.cpp index f96ff4c9e5..b16cefe377 100644 --- a/track_analyzing/utils.cpp +++ b/track_analyzing/utils.cpp @@ -93,7 +93,7 @@ MatchedTrack const & GetMatchedTrack(MwmToMatchedTracks const & mwmToMatchedTrac std::string GetCurrentVersionMwmFile(storage::Storage const & storage, std::string const & mwmName) { - return my::JoinPath(GetPlatform().WritableDir(), to_string(storage.GetCurrentDataVersion()), + return base::JoinPath(GetPlatform().WritableDir(), to_string(storage.GetCurrentDataVersion()), mwmName + DATA_FILE_EXTENSION); } @@ -126,7 +126,7 @@ void ForEachTrackFile( for (string const & file : filesList) { - if (my::GetFileExtension(file) != extension) + if (base::GetFileExtension(file) != extension) continue; MwmToMatchedTracks mwmToMatchedTracks; |