diff --git a/map/taxi_delegate.cpp b/map/taxi_delegate.cpp index a936c243ad..b0fecf41ad 100644 --- a/map/taxi_delegate.cpp +++ b/map/taxi_delegate.cpp @@ -8,31 +8,26 @@ #include "coding/multilang_utf8_string.hpp" -#include "geometry/mercator.hpp" - TaxiDelegate::TaxiDelegate(storage::Storage const & st, storage::CountryInfoGetter const & ig, search::CityFinder & cf) : m_storage(st), m_infoGetter(ig), m_cityFinder(cf) { } -storage::TCountriesVec TaxiDelegate::GetCountryIds(ms::LatLon const & latlon) +storage::TCountriesVec TaxiDelegate::GetCountryIds(m2::PointD const & point) { - m2::PointD const point = MercatorBounds::FromLatLon(latlon); auto const countryId = m_infoGetter.GetRegionCountryId(point); storage::TCountriesVec topmostCountryIds; m_storage.GetTopmostNodesFor(countryId, topmostCountryIds); return topmostCountryIds; } -std::string TaxiDelegate::GetCityName(ms::LatLon const & latlon) +std::string TaxiDelegate::GetCityName(m2::PointD const & point) { - m2::PointD const point = MercatorBounds::FromLatLon(latlon); return m_cityFinder.GetCityName(point, StringUtf8Multilang::kEnglishCode); } -storage::TCountryId TaxiDelegate::GetMwmId(ms::LatLon const & latlon) +storage::TCountryId TaxiDelegate::GetMwmId(m2::PointD const & point) { - m2::PointD const point = MercatorBounds::FromLatLon(latlon); return m_infoGetter.GetRegionCountryId(point); } diff --git a/map/taxi_delegate.hpp b/map/taxi_delegate.hpp index cee8775ce9..2606901075 100644 --- a/map/taxi_delegate.hpp +++ b/map/taxi_delegate.hpp @@ -18,9 +18,9 @@ class TaxiDelegate : public taxi::Delegate public: TaxiDelegate(storage::Storage const & st, storage::CountryInfoGetter const & ig, search::CityFinder & cf); - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override; - std::string GetCityName(ms::LatLon const & latlon) override; - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override; + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override; + std::string GetCityName(m2::PointD const & point) override; + storage::TCountryId GetMwmId(m2::PointD const & point) override; private: storage::Storage const & m_storage; diff --git a/partners_api/CMakeLists.txt b/partners_api/CMakeLists.txt index edca2ece30..a637047845 100644 --- a/partners_api/CMakeLists.txt +++ b/partners_api/CMakeLists.txt @@ -29,10 +29,10 @@ set( rb_ads.hpp taxi_base.cpp taxi_base.hpp - taxi_places.cpp - taxi_places.hpp taxi_engine.cpp taxi_engine.hpp + taxi_places.cpp + taxi_places.hpp taxi_places_constants.hpp taxi_provider.hpp uber_api.cpp diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp index 3be341bfca..6fd3469c25 100644 --- a/partners_api/partners_api_tests/taxi_engine_tests.cpp +++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp @@ -22,61 +22,61 @@ namespace class BelarusMinskDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override { return {"Belarus"}; } + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"Belarus"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return "Minsk"; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return "Minsk"; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; class UkraineOdessaDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override { return {"Ukraine"}; } + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"Ukraine"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return "Odessa"; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return "Odessa"; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; class UkraineMariupolDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override { return {"Ukraine"}; } + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"Ukraine"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return "Mariupol"; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return "Mariupol"; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; class BulgariaSofiaDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override { return {"Bulgaria"}; } + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"Bulgaria"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return "Sofia"; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return "Sofia"; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; class UsaDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"United States of America"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return ""; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return {}; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; class RussiaKonetsDelegate : public taxi::Delegate { public: - storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) override + storage::TCountriesVec GetCountryIds(m2::PointD const & point) override { return {"Russian Federation"}; } - std::string GetCityName(ms::LatLon const & latlon) override { return "Konets"; } - storage::TCountryId GetMwmId(ms::LatLon const & latlon) override { return ""; } + std::string GetCityName(m2::PointD const & point) override { return "Konets"; } + storage::TCountryId GetMwmId(m2::PointD const & point) override { return {}; } }; std::vector GetUberSynchronous(ms::LatLon const & from, ms::LatLon const & to, diff --git a/partners_api/taxi_base.cpp b/partners_api/taxi_base.cpp index 4ca7809dda..99ddf5d55f 100644 --- a/partners_api/taxi_base.cpp +++ b/partners_api/taxi_base.cpp @@ -6,17 +6,6 @@ namespace { // The maximum supported distance in meters by default. double const kMaxSupportedDistance = 100000; - -bool HasMwmId(taxi::Places const & places, storage::TCountryId const & mwmId) -{ - if (mwmId.empty()) - return false; - - if (places.IsMwmsEmpty()) - return true; - - return places.Has(mwmId); -} } // namespace namespace taxi @@ -62,11 +51,23 @@ bool ApiItem::IsAnyCountryEnabled(storage::TCountriesVec const & countryIds, bool ApiItem::IsMwmDisabled(storage::TCountryId const & mwmId) const { - return HasMwmId(m_disabledPlaces, mwmId); + if (mwmId.empty()) + return false; + + if (m_disabledPlaces.IsMwmsEmpty()) + return false; + + return m_disabledPlaces.Has(mwmId); } bool ApiItem::IsMwmEnabled(storage::TCountryId const & mwmId) const { - return HasMwmId(m_enabledPlaces, mwmId); + if (mwmId.empty()) + return false; + + if (m_enabledPlaces.IsMwmsEmpty()) + return true; + + return m_enabledPlaces.Has(mwmId); } } // namespace taxi diff --git a/partners_api/taxi_engine.cpp b/partners_api/taxi_engine.cpp index 5c136bd491..aac1b8a1f3 100644 --- a/partners_api/taxi_engine.cpp +++ b/partners_api/taxi_engine.cpp @@ -5,6 +5,7 @@ #include "partners_api/yandex_api.hpp" #include "geometry/latlon.hpp" +#include "geometry/mercator.hpp" #include "base/macros.hpp" #include "base/stl_add.hpp" @@ -132,13 +133,14 @@ uint64_t Engine::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const auto const reqId = ++m_requestId; auto const maker = m_maker; + auto const pointFrom = MercatorBounds::FromLatLon(from); maker->Reset(reqId, m_apis.size(), successFn, errorFn); for (auto const & api : m_apis) { auto type = api.m_type; - if (!IsAvailableAtPos(type, from)) + if (!IsAvailableAtPos(type, pointFrom)) { maker->DecrementRequestCount(reqId); maker->MakeResult(reqId); @@ -177,50 +179,51 @@ RideRequestLinks Engine::GetRideRequestLinks(Provider::Type type, std::string co std::vector Engine::GetProvidersAtPos(ms::LatLon const & pos) const { std::vector result; + auto const point = MercatorBounds::FromLatLon(pos); for (auto const & api : m_apis) { - if (IsAvailableAtPos(api.m_type, pos)) + if (IsAvailableAtPos(api.m_type, point)) result.push_back(api.m_type); } return result; } -bool Engine::IsAvailableAtPos(Provider::Type type, ms::LatLon const & pos) const +bool Engine::IsAvailableAtPos(Provider::Type type, m2::PointD const & point) const { - if (IsDisabledAtPos(type, pos)) + if (IsDisabledAtPos(type, point)) return false; - return IsEnabledAtPos(type, pos); + return IsEnabledAtPos(type, point); } -bool Engine::IsDisabledAtPos(Provider::Type type, ms::LatLon const & latlon) const +bool Engine::IsDisabledAtPos(Provider::Type type, m2::PointD const & point) const { auto const it = FindByProviderType(type, m_apis.cbegin(), m_apis.cend()); CHECK(it != m_apis.cend(), ()); - if (it->IsMwmDisabled(m_delegate->GetMwmId(latlon))) + if (it->IsMwmDisabled(m_delegate->GetMwmId(point))) return true; - auto const countryIds = m_delegate->GetCountryIds(latlon); - auto const city = m_delegate->GetCityName(latlon); + auto const countryIds = m_delegate->GetCountryIds(point); + auto const city = m_delegate->GetCityName(point); return it->AreAllCountriesDisabled(countryIds, city); } -bool Engine::IsEnabledAtPos(Provider::Type type, ms::LatLon const & latlon) const +bool Engine::IsEnabledAtPos(Provider::Type type, m2::PointD const & point) const { auto const it = FindByProviderType(type, m_apis.cbegin(), m_apis.cend()); CHECK(it != m_apis.cend(), ()); - if (it->IsMwmEnabled(m_delegate->GetMwmId(latlon))) + if (it->IsMwmEnabled(m_delegate->GetMwmId(point))) return true; - auto const countryIds = m_delegate->GetCountryIds(latlon); - auto const city = m_delegate->GetCityName(latlon); + auto const countryIds = m_delegate->GetCountryIds(point); + auto const city = m_delegate->GetCityName(point); return it->IsAnyCountryEnabled(countryIds, city); } diff --git a/partners_api/taxi_engine.hpp b/partners_api/taxi_engine.hpp index c8f5d2c22f..851f83f8e1 100644 --- a/partners_api/taxi_engine.hpp +++ b/partners_api/taxi_engine.hpp @@ -4,6 +4,8 @@ #include "platform/safe_callback.hpp" +#include "geometry/point2d.hpp" + #include #include #include @@ -22,9 +24,9 @@ class Delegate public: virtual ~Delegate() = default; - virtual storage::TCountriesVec GetCountryIds(ms::LatLon const & latlon) = 0; - virtual std::string GetCityName(ms::LatLon const & latlon) = 0; - virtual storage::TCountryId GetMwmId(ms::LatLon const & latlon) = 0; + virtual storage::TCountriesVec GetCountryIds(m2::PointD const & point) = 0; + virtual std::string GetCityName(m2::PointD const & point) = 0; + virtual storage::TCountryId GetMwmId(m2::PointD const & point) = 0; }; /// This class is used to collect replies from all taxi apis and to call callback when all replies @@ -84,9 +86,9 @@ public: std::vector GetProvidersAtPos(ms::LatLon const & pos) const; private: - bool IsAvailableAtPos(Provider::Type type, ms::LatLon const & pos) const; - bool IsDisabledAtPos(Provider::Type type, ms::LatLon const & latlon) const; - bool IsEnabledAtPos(Provider::Type type, ms::LatLon const & latlon) const; + bool IsAvailableAtPos(Provider::Type type, m2::PointD const & point) const; + bool IsDisabledAtPos(Provider::Type type, m2::PointD const & point) const; + bool IsEnabledAtPos(Provider::Type type, m2::PointD const & point) const; template void AddApi(std::vector const & urls, Provider::Type type, Places const & enabled, diff --git a/partners_api/taxi_places_constants.hpp b/partners_api/taxi_places_constants.hpp index 42f3dc419e..564c9beed2 100644 --- a/partners_api/taxi_places_constants.hpp +++ b/partners_api/taxi_places_constants.hpp @@ -6,7 +6,7 @@ namespace taxi { namespace places { -// Places which are enabled for yandex taxi and in the same time are disabled for uber taxi. +// Places which are enabled for yandex taxi and at the same time are disabled for uber taxi. Places const kUberDisabledPlaces = { {{"Armenia", {}}, {"Azerbaijan Region", {"Baku"}}, diff --git a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj index 264395481d..d373585ca8 100644 --- a/xcode/partners_api/partners_api.xcodeproj/project.pbxproj +++ b/xcode/partners_api/partners_api.xcodeproj/project.pbxproj @@ -34,9 +34,6 @@ 3D452AF31EE6D20D009EAB9B /* google_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D452AF11EE6D20D009EAB9B /* google_ads.cpp */; }; 3D452AF41EE6D20D009EAB9B /* google_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D452AF21EE6D20D009EAB9B /* google_ads.hpp */; }; 3D47B29A1F054C89000828D2 /* taxi_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2961F054C89000828D2 /* taxi_base.cpp */; }; - 3D47B29B1F054C89000828D2 /* taxi_countries.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2971F054C89000828D2 /* taxi_countries.cpp */; }; - 3D47B29C1F054C89000828D2 /* taxi_countries.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2981F054C89000828D2 /* taxi_countries.hpp */; }; - 3D47B29D1F054C89000828D2 /* taxi_places.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2991F054C89000828D2 /* taxi_places.hpp */; }; 3D47B2B11F14FA14000828D2 /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2B01F14FA14000828D2 /* utils.hpp */; }; 3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E997A1FB439260025B48C /* booking_availability_params.hpp */; }; 3D4E997D1FB439260025B48C /* booking_availability_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4E997B1FB439260025B48C /* booking_availability_params.cpp */; }; @@ -44,6 +41,9 @@ 3D7815761F3A14910068B6AC /* async_gui_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D7815751F3A14910068B6AC /* async_gui_thread.hpp */; }; 3DBC1C541E4B14920016897F /* facebook_ads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DBC1C521E4B14920016897F /* facebook_ads.cpp */; }; 3DBC1C551E4B14920016897F /* facebook_ads.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DBC1C531E4B14920016897F /* facebook_ads.hpp */; }; + 3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DF01C2A20652462005DDF8C /* taxi_places.cpp */; }; + 3DF01C2E20652463005DDF8C /* taxi_places.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF01C2B20652463005DDF8C /* taxi_places.hpp */; }; + 3DF01C2F20652463005DDF8C /* taxi_places_constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DF01C2C20652463005DDF8C /* taxi_places_constants.hpp */; }; 3DFEBF851EF82BEA00317D5C /* viator_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF831EF82BEA00317D5C /* viator_api.cpp */; }; 3DFEBF861EF82BEA00317D5C /* viator_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF841EF82BEA00317D5C /* viator_api.hpp */; }; 3DFEBF891EF82C1300317D5C /* viator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF871EF82C1300317D5C /* viator_tests.cpp */; }; @@ -106,9 +106,6 @@ 3D452AF21EE6D20D009EAB9B /* google_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = google_ads.hpp; sourceTree = ""; }; 3D47B2801F00F94D000828D2 /* mopub_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mopub_tests.cpp; sourceTree = ""; }; 3D47B2961F054C89000828D2 /* taxi_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_base.cpp; sourceTree = ""; }; - 3D47B2971F054C89000828D2 /* taxi_countries.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_countries.cpp; sourceTree = ""; }; - 3D47B2981F054C89000828D2 /* taxi_countries.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_countries.hpp; sourceTree = ""; }; - 3D47B2991F054C89000828D2 /* taxi_places.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_places.hpp; sourceTree = ""; }; 3D47B2B01F14FA14000828D2 /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = ""; }; 3D4E997A1FB439260025B48C /* booking_availability_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = booking_availability_params.hpp; sourceTree = ""; }; 3D4E997B1FB439260025B48C /* booking_availability_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_availability_params.cpp; sourceTree = ""; }; @@ -117,6 +114,9 @@ 3DBC1C501E4B14810016897F /* facebook_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_tests.cpp; sourceTree = ""; }; 3DBC1C521E4B14920016897F /* facebook_ads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = facebook_ads.cpp; sourceTree = ""; }; 3DBC1C531E4B14920016897F /* facebook_ads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = facebook_ads.hpp; sourceTree = ""; }; + 3DF01C2A20652462005DDF8C /* taxi_places.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = taxi_places.cpp; sourceTree = ""; }; + 3DF01C2B20652463005DDF8C /* taxi_places.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_places.hpp; sourceTree = ""; }; + 3DF01C2C20652463005DDF8C /* taxi_places_constants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = taxi_places_constants.hpp; sourceTree = ""; }; 3DFEBF831EF82BEA00317D5C /* viator_api.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viator_api.cpp; sourceTree = ""; }; 3DFEBF841EF82BEA00317D5C /* viator_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = viator_api.hpp; sourceTree = ""; }; 3DFEBF871EF82C1300317D5C /* viator_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viator_tests.cpp; sourceTree = ""; }; @@ -208,6 +208,9 @@ F6B5363B1DA520B20067EEA5 /* partners_api */ = { isa = PBXGroup; children = ( + 3DF01C2C20652463005DDF8C /* taxi_places_constants.hpp */, + 3DF01C2A20652462005DDF8C /* taxi_places.cpp */, + 3DF01C2B20652463005DDF8C /* taxi_places.hpp */, 346E888F1E9D087400D4CE9B /* ads_base.cpp */, 346E88901E9D087400D4CE9B /* ads_base.hpp */, 346E88911E9D087400D4CE9B /* ads_engine.cpp */, @@ -233,11 +236,8 @@ 346E88951E9D087400D4CE9B /* rb_ads.hpp */, 3D47B2961F054C89000828D2 /* taxi_base.cpp */, 3DFEBF941EFBFC1500317D5C /* taxi_base.hpp */, - 3D47B2971F054C89000828D2 /* taxi_countries.cpp */, - 3D47B2981F054C89000828D2 /* taxi_countries.hpp */, 3DFEBF951EFBFC1500317D5C /* taxi_engine.cpp */, 3DFEBF961EFBFC1500317D5C /* taxi_engine.hpp */, - 3D47B2991F054C89000828D2 /* taxi_places.hpp */, 3DFEBF971EFBFC1500317D5C /* taxi_provider.hpp */, F6B5363E1DA520E40067EEA5 /* uber_api.cpp */, F6B5363F1DA520E40067EEA5 /* uber_api.hpp */, @@ -310,9 +310,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3D47B29C1F054C89000828D2 /* taxi_countries.hpp in Headers */, 346E88971E9D087400D4CE9B /* ads_base.hpp in Headers */, - 3D47B29D1F054C89000828D2 /* taxi_places.hpp in Headers */, 3D7815761F3A14910068B6AC /* async_gui_thread.hpp in Headers */, F67E75261DB8F06F00D6741F /* opentable_api.hpp in Headers */, 3D452AF41EE6D20D009EAB9B /* google_ads.hpp in Headers */, @@ -330,7 +328,9 @@ 3D4E997C1FB439260025B48C /* booking_availability_params.hpp in Headers */, 3DFEBF9C1EFBFC1500317D5C /* taxi_engine.hpp in Headers */, F6B536431DA520E40067EEA5 /* uber_api.hpp in Headers */, + 3DF01C2F20652463005DDF8C /* taxi_places_constants.hpp in Headers */, 3DBC1C551E4B14920016897F /* facebook_ads.hpp in Headers */, + 3DF01C2E20652463005DDF8C /* taxi_places.hpp in Headers */, BB1956E71F543D7C003ECE6C /* locals_api.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -438,10 +438,10 @@ F6B536421DA520E40067EEA5 /* uber_api.cpp in Sources */, 3DFEBF9B1EFBFC1500317D5C /* taxi_engine.cpp in Sources */, 346E889B1E9D087400D4CE9B /* rb_ads.cpp in Sources */, + 3DF01C2D20652463005DDF8C /* taxi_places.cpp in Sources */, 3DBC1C541E4B14920016897F /* facebook_ads.cpp in Sources */, 3D452AF31EE6D20D009EAB9B /* google_ads.cpp in Sources */, 346E88981E9D087400D4CE9B /* ads_engine.cpp in Sources */, - 3D47B29B1F054C89000828D2 /* taxi_countries.cpp in Sources */, F67E75251DB8F06F00D6741F /* opentable_api.cpp in Sources */, BB1956E61F543D7C003ECE6C /* locals_api.cpp in Sources */, 3DFEBFA31EFBFC2300317D5C /* taxi_engine_tests.cpp in Sources */,