diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index a343d977ad..252d79a9ba 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -185,7 +185,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, jAddress.get(), jbanners.get(), jTaxiTypes.get(), jBookingSearchUrl.get(), localAdInfo.get(), routingPointInfo.get(), info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, - popularity.get(), jDescription.get(), info.IsTopChoise(), jrawTypes.get()); + popularity.get(), jDescription.get(), info.IsTopChoice(), jrawTypes.get()); if (info.IsFeature()) InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); @@ -280,7 +280,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, popularity.get(), info.GetDescription(), info.GetRoadType(), - info.IsTopChoise(), jrawTypes.get()); + info.IsTopChoice(), jrawTypes.get()); } if (info.HasApiUrl()) @@ -292,7 +292,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, popularity.get(), info.GetDescription(), info.GetRoadType(), - info.IsTopChoise(), jrawTypes.get()); + info.IsTopChoice(), jrawTypes.get()); } return CreateMapObject( @@ -302,7 +302,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) jTaxiTypes.get(), info.GetBookingSearchUrl(), localAdInfo.get(), routingPointInfo.get(), info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, popularity.get(), - info.GetDescription(), info.GetRoadType(), info.IsTopChoise(), jrawTypes.get()); + info.GetDescription(), info.GetRoadType(), info.IsTopChoice(), jrawTypes.get()); } jobjectArray ToBannersArray(JNIEnv * env, std::vector const & banners) diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h index de6e6bba29..3528912fa1 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h @@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly) BOOL isMyPosition; @property(nonatomic, readonly) BOOL hasBanner; @property(nonatomic, readonly) BOOL isPopular; -@property(nonatomic, readonly) BOOL isTopChoise; +@property(nonatomic, readonly) BOOL isTopChoice; @property(nonatomic, readonly) BOOL isBookingPlace; @property(nonatomic, readonly) BOOL showUgc; @property(nonatomic, readonly, nullable) NSArray *banners; diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm index fa6dd4f8a4..4dab7faed3 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm @@ -81,7 +81,7 @@ static PlacePageDataHotelType convertHotelType(std::optional 0; - _isTopChoise = rawData.IsTopChoise(); + _isTopChoice = rawData.IsTopChoice(); _isBookingPlace = rawData.GetSponsoredType() == place_page::SponsoredType::Booking; _schedule = convertOpeningHours(rawData.GetOpeningHours()); _hotelType = convertHotelType(rawData.GetHotelType()); diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift index fd32fbad3e..af84f73003 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift @@ -94,7 +94,7 @@ final class PlacePagePreviewViewController: UIViewController { subtitleString.append(NSAttributedString(string: L("popular_place"), attributes: [.foregroundColor : UIColor.linkBlue(), .font : UIFont.regular14()])) - } else if placePagePreviewData.isTopChoise { + } else if placePagePreviewData.isTopChoice { subtitleString.append(NSAttributedString(string: L("mustsee_title"), attributes: [.foregroundColor : UIColor.linkBlue(), .font : UIFont.regular14()])) diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp index dcdb4ebeae..6ee2a9e8f1 100644 --- a/map/place_page_info.cpp +++ b/map/place_page_info.cpp @@ -245,8 +245,8 @@ void Info::SetFromBookmarkProperties(kml::Properties const & p) m_metadata.Set(feature::Metadata::EType::FMD_EMAIL, email->second); if (auto const url = p.find("url"); url != p.end() && !url->second.empty()) m_metadata.Set(feature::Metadata::EType::FMD_URL, url->second); - if (auto const isTopChoise = p.find("is_top_choise"); isTopChoise != p.end()) - m_isTopChoise = isTopChoise->second == "1"; + if (auto const isTopChoice = p.find("is_top_choice"); isTopChoice != p.end()) + m_isTopChoice = isTopChoice->second == "1"; } void Info::SetBookmarkId(kml::MarkId bookmarkId) diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp index 4140ec8fcc..7bdf58f683 100644 --- a/map/place_page_info.hpp +++ b/map/place_page_info.hpp @@ -209,7 +209,7 @@ public: void SetBookmarkCategoryName(std::string const & name) { m_bookmarkCategoryName = name; } void SetBookmarkData(kml::BookmarkData const & data) { m_bookmarkData = data; } kml::BookmarkData const & GetBookmarkData() const { return m_bookmarkData; } - bool IsTopChoise() const { return m_isTopChoise; } + bool IsTopChoice() const { return m_isTopChoice; } /// Track void SetTrackId(kml::TrackId trackId) { m_trackId = trackId; }; @@ -363,7 +363,7 @@ private: /// If not invalid, track is bound to this place page. kml::TrackId m_trackId = kml::kInvalidTrackId; /// Whether to show "Must See". - bool m_isTopChoise = false; + bool m_isTopChoice = false; /// Guide bool m_isGuide = false;