From 57e446d52b651b8a81a03994bac9c30d72364eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BE=D0=B1=D1=80=D1=8B=D0=B8=CC=86=20=D0=AD=D1=8D?= =?UTF-8?q?=D1=85?= Date: Fri, 7 Jul 2017 11:08:36 +0300 Subject: [PATCH] [routing] Pull request #6521 review fixes --- routing/online_absent_fetcher.cpp | 10 ++++++++-- routing/online_absent_fetcher.hpp | 6 +----- routing/online_cross_fetcher.cpp | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp index 64e90b12f6..1053d41d9f 100644 --- a/routing/online_absent_fetcher.cpp +++ b/routing/online_absent_fetcher.cpp @@ -17,6 +17,14 @@ using platform::LocalCountryFile; namespace routing { +OnlineAbsentCountriesFetcher::OnlineAbsentCountriesFetcher( + TCountryFileFn const & countryFileFn, TCountryLocalFileFn const & countryLocalFileFn) + : m_countryFileFn(countryFileFn), m_countryLocalFileFn(countryLocalFileFn) +{ + CHECK(m_countryFileFn, ()); + CHECK(m_countryLocalFileFn, ()); +} + void OnlineAbsentCountriesFetcher::GenerateRequest(Checkpoints const & checkpoints) { if (GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) @@ -53,8 +61,6 @@ void OnlineAbsentCountriesFetcher::GetAbsentCountries(vector & countries m_fetcherThread.reset(); my::SortUnique(countries); - for (auto const & country : countries) - LOG(LINFO, ("Needs:", country)); } bool OnlineAbsentCountriesFetcher::AllPointsInSameMwm(Checkpoints const & checkpoints) const diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp index 3dfafa9b9e..70fdfde64e 100644 --- a/routing/online_absent_fetcher.hpp +++ b/routing/online_absent_fetcher.hpp @@ -30,11 +30,7 @@ public: class OnlineAbsentCountriesFetcher : public IOnlineFetcher { public: - OnlineAbsentCountriesFetcher(TCountryFileFn const & countryFileFn, - TCountryLocalFileFn const & countryLocalFileFn) - : m_countryFileFn(countryFileFn), m_countryLocalFileFn(countryLocalFileFn) - { - } + OnlineAbsentCountriesFetcher(TCountryFileFn const &, TCountryLocalFileFn const &); // IOnlineFetcher overrides: void GenerateRequest(Checkpoints const &) override; diff --git a/routing/online_cross_fetcher.cpp b/routing/online_cross_fetcher.cpp index 9381eebc6d..d7854dfc22 100644 --- a/routing/online_cross_fetcher.cpp +++ b/routing/online_cross_fetcher.cpp @@ -56,6 +56,7 @@ OnlineCrossFetcher::OnlineCrossFetcher(TCountryFileFn const & countryFileFn, string const & serverURL, Checkpoints const & checkpoints) : m_countryFileFn(countryFileFn), m_serverURL(serverURL), m_checkpoints(checkpoints) { + CHECK(m_countryFileFn, ()); } void OnlineCrossFetcher::Do()