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

[iOS] fix crash when tap on "Similar hotels" in PP

Browse source
This commit is contained in:
Aleksey Belousov 2020-04-07 13:38:10 +03:00 • committed by Vladimir Byko-Ianko
parent 3d762a844c
commit 117700fef1
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h
View file

@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) NSString *address;
@property(nonatomic, readonly, nullable) NSString *pricing;
@property(nonatomic, readonly, nullable) NSNumber *rawPricing;
@property(nonatomic, readonly) float rawRating;
@property(nonatomic, readonly) PlacePageDataSchedule schedule;
@property(nonatomic, readonly) PlacePageDataHotelType hotelType;
@property(nonatomic, readonly) BOOL hasBanner;

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
View file

@ -78,6 +78,7 @@ static PlacePageDataHotelType convertHotelType(std::optional<ftypes::IsHotelChec
_address = rawData.GetAddress().empty() ? nil : @(rawData.GetAddress().c_str());
_pricing = rawData.GetApproximatePricing().empty() ? nil : @(rawData.GetApproximatePricing().c_str());
_rawPricing = rawData.GetRawApproximatePricing() ? nil : [[NSNumber alloc] initWithInt: *(rawData.GetRawApproximatePricing())];
_rawRating = rawData.GetRatingRawValue();
_isPopular = rawData.GetPopularity() > 0;
_isBookingPlace = rawData.GetSponsoredType() == place_page::SponsoredType::Booking;
_schedule = convertOpeningHours(rawData.GetOpeningHours());

5
iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
View file

@ -18,8 +18,7 @@ static int8_t kAgeOfChild = 5;
_types.insert(ftypes::IsHotelChecker::Type::Hotel);
PlacePagePreviewData *previewData = data.previewData;
HotelBookingData *hotelBookingData = data.hotelBooking;
CHECK(previewData && hotelBookingData,
CHECK(previewData.hotelType != PlacePageDataHotelTypeNone,
("Incorrect hotel type at coordinate:", data.locationCoordinate.latitude, data.locationCoordinate.longitude));
if (data.sponsoredType == PlacePageSponsoredTypeBooking)
@ -30,7 +29,7 @@ static int8_t kAgeOfChild = 5;
_price.insert(static_cast<Price>(price));
}
self.rating = place_page::rating::GetFilterRating(hotelBookingData.score);
self.rating = place_page::rating::GetFilterRating(previewData.rawRating);
}
}