organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[taxi] places review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-04-12 17:23:32 +03:00 • committed by Roman Kuznetsov
parent 590bc06d18
commit dcb9a778f9
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coding/serdes_json.hpp
View file

@ -165,7 +165,7 @@ public:
template <typename T>
void operator()(std::vector<T> & vs, char const * name = nullptr)
{
json_t * context = SaveContext(name);
json_t * outerContext = SaveContext(name);
if (!json_is_array(m_json))
MYTHROW(my::Json::Exception, ("The field", name, "must contain a json array."));
@ -179,13 +179,13 @@ public:
RestoreContext(context);
}
RestoreContext(context);
RestoreContext(outerContext);
}
template <typename T>
void operator()(std::unordered_set<T> & dest, char const * name = nullptr)
{
json_t * context = SaveContext(name);
json_t * outerContext = SaveContext(name);
if (!json_is_array(m_json))
MYTHROW(my::Json::Exception, ("The field", name, "must contain a json array."));
@ -202,7 +202,7 @@ public:
RestoreContext(context);
}
RestoreContext(context);
RestoreContext(outerContext);
}
template <typename R>

12
partners_api/partners_api_tests/taxi_places_tests.cpp
View file

@ -15,9 +15,9 @@ public:
{
using places::Loader;
std::vector<taxi::SupportedPlaces> places = {Loader::LoadFor(Provider::Type::Maxim),
Loader::LoadFor(Provider::Type::Uber),
Loader::LoadFor(Provider::Type::Yandex)};
std::vector<taxi::SupportedPlaces> places;
for (size_t i = 0; i < Provider::Type::Count; ++i)
places.emplace_back(Loader::LoadFor(static_cast<Provider::Type>(i)));
for (size_t i = 0; i < places.size(); ++i)
{
@ -26,14 +26,14 @@ public:
if (i == j)
continue;
FindIdenticalPlaces(places[i].m_enabledPlaces, places[j].m_enabledPlaces);
FindIdenticalPlaces(places[i].m_disabledPlaces, places[j].m_disabledPlaces);
CheckAbsenceOfSimilarPlaces(places[i].m_enabledPlaces, places[j].m_enabledPlaces);
CheckAbsenceOfSimilarPlaces(places[i].m_disabledPlaces, places[j].m_disabledPlaces);
}
}
}
private:
static void FindIdenticalPlaces(taxi::Places const & lhs, taxi::Places const & rhs)
static void CheckAbsenceOfSimilarPlaces(taxi::Places const & lhs, taxi::Places const & rhs)
{
for (auto const & country : lhs.m_countries)
{

3
partners_api/taxi_provider.hpp
View file

@ -23,7 +23,8 @@ public:
{
Uber,
Yandex,
Maxim
Maxim,
Count
};
using Iter = std::vector<Product>::iterator;