diff --git a/integration_tests/integration_tests.pro b/integration_tests/integration_tests.pro index 7307b75d7e..9d49a291c6 100644 --- a/integration_tests/integration_tests.pro +++ b/integration_tests/integration_tests.pro @@ -11,7 +11,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = .. -DEPENDENCIES = map routing search storage indexer platform geometry stats_client coding base osrm jansson protobuf tomcrypt succinct stats_client zlib +DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct stats_client zlib macx-*: LIBS *= "-framework Foundation" "-framework IOKit" diff --git a/routing/online_cross_fetcher.cpp b/routing/online_cross_fetcher.cpp index fe9877cd64..3412c19d7d 100644 --- a/routing/online_cross_fetcher.cpp +++ b/routing/online_cross_fetcher.cpp @@ -17,7 +17,7 @@ bool ParseResponse(const string & serverResponse, vector & outPoints { my::Json parser(serverResponse.c_str()); - json_t * countries = json_object_get(parser.get(), "used_mwms"); + json_t const * countries = json_object_get(parser.get(), "used_mwms"); size_t pointsCount = json_array_size(countries); outPoints.reserve(pointsCount); for (size_t i = 0; i < pointsCount; ++i) @@ -28,7 +28,7 @@ bool ParseResponse(const string & serverResponse, vector & outPoints } return !outPoints.empty(); } - catch (my::Json::Exception) + catch (my::Json::Exception&) { return false; } @@ -53,7 +53,7 @@ OnlineCrossFetcher::OnlineCrossFetcher(string const & serverURL, m2::PointD cons vector const & OnlineCrossFetcher::GetMwmPoints() { m_mwmPoints.clear(); - if (!m_request.RunHTTPRequest()) + if (m_request.RunHTTPRequest()) ParseResponse(m_request.server_response(), m_mwmPoints); return m_mwmPoints; } diff --git a/routing/online_cross_fetcher.hpp b/routing/online_cross_fetcher.hpp index 94c981d457..9e93e30875 100644 --- a/routing/online_cross_fetcher.hpp +++ b/routing/online_cross_fetcher.hpp @@ -36,7 +36,7 @@ public: OnlineCrossFetcher(string const & serverURL, m2::PointD const & startPoint, m2::PointD const & finalPoint); - /// \brief getMwmNames Waits for a server response, and returns mwm names list. + /// \brief getMwmPoints Waits for a server response, and returns mwm representation points list. /// \return Mwm names to build route from startPt to finishPt. Empty list if there were errors. /// \warning Can take a long time while waits a server response. vector const & GetMwmPoints(); diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp index 9aa0b887a2..26eb88acb6 100644 --- a/routing/osrm_router.cpp +++ b/routing/osrm_router.cpp @@ -69,7 +69,7 @@ public: RoutingMappingPtrT mapping = m_indexManager.GetMappingByPoint(point, m_index); if (!mapping->IsValid()) { - LOG(LINFO, ("Online recomends to download", mapping->GetName())); + LOG(LINFO, ("Online recomends to download: ", mapping->GetName())); m_route.AddAbsentCountry(mapping->GetName()); } }