pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #5512 from milchakov/booking_facilities_format

Browse source 
Booking facilities format changed (core part)
This commit is contained in:
Yuri Gorshenin 2017-03-03 19:26:13 +03:00 • committed by GitHub
commit 86e957d53e
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/Sponsored.cpp
View file

@ -87,7 +87,7 @@ jobjectArray ToFacilitiesArray(JNIEnv * env, vector<HotelFacility> const & facil
return jni::ToJavaArray(env, g_facilityTypeClass, facilities,
[](JNIEnv * env, HotelFacility const & item) {
return env->NewObject(g_facilityTypeClass, g_facilityConstructor,
jni::ToJavaString(env, item.m_facilityType),
jni::ToJavaString(env, item.m_type),
jni::ToJavaString(env, item.m_name));
});
}

12
partners_api/booking_api.cpp
View file

@ -92,11 +92,13 @@ vector<HotelFacility> ParseFacilities(json_t const * facilitiesArray)
for (size_t i = 0; i < sz; ++i)
{
auto item = json_array_get(facilitiesArray, i);
auto itemArray = json_array_get(facilitiesArray, i);
ASSERT(json_is_array(itemArray), ());
ASSERT_EQUAL(json_array_size(itemArray), 2, ());
HotelFacility facility;
my::FromJSONObject(item, "type", facility.m_facilityType);
my::FromJSONObject(item, "name", facility.m_name);
my::FromJSON(json_array_get(itemArray, 0), facility.m_type);
my::FromJSON(json_array_get(itemArray, 1), facility.m_name);
facilities.push_back(move(facility));
}
@ -158,7 +160,7 @@ vector<HotelReview> ParseReviews(json_t const * reviewsArray)
review.m_date = system_clock::from_time_t(mktime(&t));
double score;
my::FromJSONObject(item, "average_score", score);
my::FromJSONObject(item, "score", score);
review.m_score = static_cast<float>(score);
my::FromJSONObject(item, "author", review.m_author);
@ -177,7 +179,7 @@ void FillHotelInfo(string const & src, HotelInfo & info)
my::FromJSONObjectOptionalField(root.get(), "description", info.m_description);
double score;
my::FromJSONObjectOptionalField(root.get(), "average_score", score);
my::FromJSONObjectOptionalField(root.get(), "score", score);
info.m_score = static_cast<float>(score);
json_int_t scoreCount = 0;

2
partners_api/booking_api.hpp
View file

@ -29,7 +29,7 @@ struct HotelReview
struct HotelFacility
{
string m_facilityType;
string m_type;
string m_name;
};