[iOS] [refactoring] add interactions to place page

2019-12-09 02:16:39 +03:00 · 2019-12-09 02:16:39 +03:00 · f0e56bd3a2
commit f0e56bd3a2
parent b763eb5126
56 changed files with 967 additions and 344 deletions
--- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
+++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
@ -19,6 +19,7 @@
 		471AB99123AB931000F56D49 /* MWMMapSearchResult+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 471AB98F23AB931000F56D49 /* MWMMapSearchResult+Core.h */; };
 		475784C22344B422008291A4 /* Framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 475784C02344B421008291A4 /* Framework.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		475784C32344B422008291A4 /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 475784C12344B422008291A4 /* Framework.cpp */; };
+		47938905239A932D006ECACC /* UgcSummaryRatingType.h in Headers */ = {isa = PBXBuildFile; fileRef = 47938904239A92F8006ECACC /* UgcSummaryRatingType.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		47942D6B237CC3D600DEFAE3 /* PlacePageData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D51237CC3B500DEFAE3 /* PlacePageData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		47942D6C237CC3DE00DEFAE3 /* PlacePageData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47942D52237CC3B500DEFAE3 /* PlacePageData.mm */; };
 		47942D6D237CC3E300DEFAE3 /* PlacePagePreviewData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D53237CC3B500DEFAE3 /* PlacePagePreviewData.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -97,6 +98,9 @@
 		47F4F1F923A3336C0022FD56 /* MWMMapNodeAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F4F1F723A3336B0022FD56 /* MWMMapNodeAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		47F4F1FA23A3336C0022FD56 /* MWMMapNodeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47F4F1F823A3336C0022FD56 /* MWMMapNodeAttributes.mm */; };
 		47F4F1FD23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F4F1FB23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		47F701EF238C86F000D18E95 /* PlacePageButtonsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F701ED238C86F000D18E95 /* PlacePageButtonsData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		47F701F0238C86F000D18E95 /* PlacePageButtonsData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47F701EE238C86F000D18E95 /* PlacePageButtonsData.mm */; };
+		47F701F3238C877C00D18E95 /* PlacePageButtonsData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F701F1238C877C00D18E95 /* PlacePageButtonsData+Core.h */; };
 		99103843237EDFA200893C9F /* DeepLinkData.h in Headers */ = {isa = PBXBuildFile; fileRef = 99103841237EDFA200893C9F /* DeepLinkData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		99103844237EDFA200893C9F /* DeepLinkData.m in Sources */ = {isa = PBXBuildFile; fileRef = 99103842237EDFA200893C9F /* DeepLinkData.m */; };
 		993F54F2237C5D1100545511 /* PromoDiscoveryCampaignAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 993F54EE237C5D1000545511 /* PromoDiscoveryCampaignAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -112,9 +116,6 @@
 		9957FAE9237AE5B000855F48 /* Logger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9957FAE7237AE5B000855F48 /* Logger.mm */; };
 		999D3A64237B097C00C5F7A8 /* DeepLinkSubscriptionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 999D3A62237B097C00C5F7A8 /* DeepLinkSubscriptionData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		999D3A65237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 999D3A63237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm */; };
-		47F701EF238C86F000D18E95 /* PlacePageButtonsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F701ED238C86F000D18E95 /* PlacePageButtonsData.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		47F701F0238C86F000D18E95 /* PlacePageButtonsData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47F701EE238C86F000D18E95 /* PlacePageButtonsData.mm */; };
-		47F701F3238C877C00D18E95 /* PlacePageButtonsData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F701F1238C877C00D18E95 /* PlacePageButtonsData+Core.h */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@ -134,6 +135,7 @@
 		471AB98F23AB931000F56D49 /* MWMMapSearchResult+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMMapSearchResult+Core.h"; sourceTree = "<group>"; };
 		475784C02344B421008291A4 /* Framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework.h; sourceTree = "<group>"; };
 		475784C12344B422008291A4 /* Framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Framework.cpp; sourceTree = "<group>"; };
+		47938904239A92F8006ECACC /* UgcSummaryRatingType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UgcSummaryRatingType.h; sourceTree = "<group>"; };
 		47942D51237CC3B500DEFAE3 /* PlacePageData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlacePageData.h; sourceTree = "<group>"; };
 		47942D52237CC3B500DEFAE3 /* PlacePageData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlacePageData.mm; sourceTree = "<group>"; };
 		47942D53237CC3B500DEFAE3 /* PlacePagePreviewData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlacePagePreviewData.h; sourceTree = "<group>"; };
@ -217,6 +219,8 @@
 		47F701ED238C86F000D18E95 /* PlacePageButtonsData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlacePageButtonsData.h; sourceTree = "<group>"; };
 		47F701EE238C86F000D18E95 /* PlacePageButtonsData.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PlacePageButtonsData.mm; sourceTree = "<group>"; };
 		47F701F1238C877C00D18E95 /* PlacePageButtonsData+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PlacePageButtonsData+Core.h"; sourceTree = "<group>"; };
+		99103841237EDFA200893C9F /* DeepLinkData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkData.h; sourceTree = "<group>"; };
+		99103842237EDFA200893C9F /* DeepLinkData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeepLinkData.m; sourceTree = "<group>"; };
 		991CE2E82375AF19009EB02A /* PromoAfterBookingCampaignAdapter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PromoAfterBookingCampaignAdapter.mm; sourceTree = "<group>"; };
 		991CE2E92375AF19009EB02A /* PromoAfterBookingCampaignAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PromoAfterBookingCampaignAdapter.h; sourceTree = "<group>"; };
 		991CE2EC2375AF25009EB02A /* PromoDiscoveryCampaignAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PromoDiscoveryCampaignAdapter.h; sourceTree = "<group>"; };
@ -377,6 +381,7 @@
 				47942D68237CC3B500DEFAE3 /* UgcData.mm */,
 				47942DAC2382ABE100DEFAE3 /* UgcSummaryRating.h */,
 				47942DAD2382ABE100DEFAE3 /* UgcSummaryRating.mm */,
+				47938904239A92F8006ECACC /* UgcSummaryRatingType.h */,
 			);
 			path = UGC;
 			sourceTree = "<group>";
@ -629,10 +634,9 @@
 				47C637D72354AEBE00E12DE0 /* MWMTrafficManager.h in Headers */,
 				993F54F2237C5D1100545511 /* PromoDiscoveryCampaignAdapter.h in Headers */,
 				99447849238559F2004DAEE5 /* DeeplinkParsingResult.h in Headers */,
-				991CE2EB2375AF19009EB02A /* PromoAfterBookingCampaignAdapter.h in Headers */,
-				991CE2EF2375AF4E009EB02A /* PromoDiscoveryCampaignAdapter.h in Headers */,
 				47942D9C237D927800DEFAE3 /* PlacePageBookmarkData.h in Headers */,
 				47942D75237CC41A00DEFAE3 /* HotelBookingData+Core.h in Headers */,
+				47938905239A932D006ECACC /* UgcSummaryRatingType.h in Headers */,
 				47942D72237CC40B00DEFAE3 /* OpeningHours.h in Headers */,
 				47C637D72354AEBE00E12DE0 /* MWMTrafficManager.h in Headers */,
 				47942D6B237CC3D600DEFAE3 /* PlacePageData.h in Headers */,
@ -731,7 +735,6 @@
 				47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */,
 				993F54F4237C5D1100545511 /* PromoDiscoveryCampaignAdapter.mm in Sources */,
 				479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */,
-				991CE2EA2375AF19009EB02A /* PromoAfterBookingCampaignAdapter.mm in Sources */,
 				47942D95237D673E00DEFAE3 /* CatalogPromoItem.mm in Sources */,
 				47942D6C237CC3DE00DEFAE3 /* PlacePageData.mm in Sources */,
 				47942DAF2382ABE100DEFAE3 /* UgcSummaryRating.mm in Sources */,
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) NSString *address;
@property(nonatomic, readonly, nullable) NSString *rawCoordinates;
@property(nonatomic, readonly, nullable) NSString *formattedCoordinates;
+@property(nonatomic, readonly, nullable) NSString *localAdsUrl;
@property(nonatomic, readonly) BOOL wifiAvailable;
@property(nonatomic, readonly) PlacePageDataLocalAdsStatus localAdsStatus;

--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
@ -70,6 +70,7 @@ static PlacePageDataLocalAdsStatus convertLocalAdsStatus(LocalAdsStatus status)
    _rawCoordinates = @(rawData.GetFormattedCoordinate(true).c_str());
    _formattedCoordinates = @(rawData.GetFormattedCoordinate(false).c_str());
    _localAdsStatus = convertLocalAdsStatus(rawData.GetLocalAdsStatus());
+    _localAdsUrl = rawData.GetLocalAdsUrl().empty() ? nil : @(rawData.GetLocalAdsUrl().c_str());
  }
  return self;
 }
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
@ -50,9 +50,20 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) BOOL isLargeToponim;
@property(nonatomic, readonly) BOOL isSightseeing;
@property(nonatomic, readonly) BOOL isPromoCatalog;
+@property(nonatomic, readonly) BOOL isPartner;
@property(nonatomic, readonly) BOOL shouldShowUgc;
@property(nonatomic, readonly) BOOL isMyPosition;
+@property(nonatomic, readonly) NSInteger partnerIndex;
+@property(nonatomic, readonly, nullable) NSString *partnerName;
@property(nonatomic, readonly) CLLocationCoordinate2D locationCoordinate;
+@property(nonatomic, readonly) NSArray<NSString *> *ratingCategories;
+@property(nonatomic, readonly) NSString *statisticsTags;
+@property(nonatomic, readonly, nullable) NSString *sponsoredURL;
+@property(nonatomic, readonly, nullable) NSString *sponsoredDescriptionURL;
+@property(nonatomic, readonly, nullable) NSString *sponsoredMoreURL;
+@property(nonatomic, readonly, nullable) NSString *sponsoredReviewURL;
+@property(nonatomic, readonly, nullable) NSString *sponsoredDeeplink;
+

 - (void)loadOnlineDataWithCompletion:(MWMVoidBlock)completion;
 - (void)loadUgcWithCompletion:(MWMVoidBlock)completion;
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
@ -80,9 +80,32 @@ static PlacePageTaxiProvider convertTaxiProvider(taxi::Provider::Type providerTy
    _isPromoCatalog = _isLargeToponim || _isSightseeing;
    _shouldShowUgc = rawData().ShouldShowUGC();
    _isMyPosition = rawData().IsMyPosition();
+    _isPartner = rawData().GetSponsoredType() == place_page::SponsoredType::Partner;
+    _partnerIndex = _isPartner ? rawData().GetPartnerIndex() : -1;
+    _partnerName = _isPartner ? @(rawData().GetPartnerName().c_str()) : nil;
    _bookingSearchUrl = rawData().GetBookingSearchUrl().empty() ? nil : @(rawData().GetBookingSearchUrl().c_str());
    auto latlon = rawData().GetLatLon();
    _locationCoordinate = CLLocationCoordinate2DMake(latlon.m_lat, latlon.m_lon);
+
+    NSMutableArray *ratingCategoriesArray = [NSMutableArray array];
+    for (auto ratingCategory : rawData().GetRatingCategories()) {
+      [ratingCategoriesArray addObject:@(ratingCategory.c_str())];
+    }
+    _ratingCategories = [ratingCategoriesArray copy];
+
+    NSMutableArray *tagsArray = [NSMutableArray array];
+    for (auto const & s : rawData().GetRawTypes()) {
+      [tagsArray addObject:@(s.c_str())];
+    }
+    _statisticsTags = [tagsArray componentsJoinedByString:@", "];
+
+    if (rawData().IsSponsored()) {
+      _sponsoredURL = @(rawData().GetSponsoredUrl().c_str());
+      _sponsoredDescriptionURL = @(rawData().GetSponsoredDescriptionUrl().c_str());
+      _sponsoredMoreURL = @(rawData().GetSponsoredMoreUrl().c_str());
+      _sponsoredReviewURL = @(rawData().GetSponsoredReviewUrl().c_str());
+      _sponsoredDeeplink = @(rawData().GetSponsoredDeepLink().c_str());
+    }
  }
  return self;
 }
--- a/iphone/CoreApi/CoreApi/PlacePageData/UGC/UgcSummaryRating.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/UGC/UgcSummaryRating.h
@ -1,13 +1,6 @@
 #import <Foundation/Foundation.h>

-typedef NS_ENUM(NSInteger, UgcSummaryRatingType) {
-  UgcSummaryRatingTypeNone,
-  UgcSummaryRatingTypeHorrible,
-  UgcSummaryRatingTypeBad,
-  UgcSummaryRatingTypeNormal,
-  UgcSummaryRatingTypeGood,
-  UgcSummaryRatingTypeExcellent
-};
+#import "UgcSummaryRatingType.h"

 NS_ASSUME_NONNULL_BEGIN

--- a/iphone/CoreApi/CoreApi/PlacePageData/UGC/UgcSummaryRatingType.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/UGC/UgcSummaryRatingType.h
@ -0,0 +1,8 @@
+typedef NS_ENUM(NSInteger, UgcSummaryRatingType) {
+  UgcSummaryRatingTypeNone,
+  UgcSummaryRatingTypeHorrible,
+  UgcSummaryRatingTypeBad,
+  UgcSummaryRatingTypeNormal,
+  UgcSummaryRatingTypeGood,
+  UgcSummaryRatingTypeExcellent
+};
--- a/iphone/Maps/Bridging-Header.h
+++ b/iphone/Maps/Bridging-Header.h
@ -57,7 +57,6 @@
 #import "MWMPlacePageManagerHelper.h"
 #import "MWMPlacePageTaxiProvider.h"
 #import "MWMPushNotifications.h"
-#import "MWMRatingSummaryViewValueType.h"
 #import "MWMReviewsViewModelProtocol.h"
 #import "MWMRouteManagerPointType.h"
 #import "MWMRoutePreviewTaxiCellType.h"
--- a/iphone/Maps/Classes/Components/MWMMailViewController.m
+++ b/iphone/Maps/Classes/Components/MWMMailViewController.m
@ -6,6 +6,7 @@
 {
  [super viewDidLoad];
  self.navigationBar.tintColor = UIColor.whiteColor;
+  self.navigationBar.barTintColor = UIColor.primary;
 }

 - (UIStatusBarStyle)preferredStatusBarStyle
--- a/iphone/Maps/Classes/Components/RatingSummaryView/MWMRatingSummaryViewValueType.h
+++ b/iphone/Maps/Classes/Components/RatingSummaryView/MWMRatingSummaryViewValueType.h
@ -1,8 +0,0 @@
-typedef NS_ENUM(NSUInteger, MWMRatingSummaryViewValueType) {
-  MWMRatingSummaryViewValueTypeNoValue,
-  MWMRatingSummaryViewValueTypeHorrible,
-  MWMRatingSummaryViewValueTypeBad,
-  MWMRatingSummaryViewValueTypeNormal,
-  MWMRatingSummaryViewValueTypeGood,
-  MWMRatingSummaryViewValueTypeExcellent
-};
--- a/iphone/Maps/Classes/Components/RatingSummaryView/RatingSummaryView.swift
+++ b/iphone/Maps/Classes/Components/RatingSummaryView/RatingSummaryView.swift
@ -8,7 +8,7 @@ final class RatingSummaryView: UIView {
    }
  }

-  var type = MWMRatingSummaryViewValueType.noValue {
+  var type = UgcSummaryRatingType.none {
    didSet {
      guard oldValue != type else { return }
      update()
@ -88,17 +88,17 @@ final class RatingSummaryView: UIView {
  }

  @IBInspectable var noValueImage: UIImage? {
-    get { return settings.images[.noValue] }
+    get { return settings.images[.none] }
    set {
-      settings.images[.noValue] = newValue
+      settings.images[.none] = newValue
      update()
    }
  }

  @IBInspectable var noValueColor: UIColor? {
-    get { return settings.colors[.noValue] }
+    get { return settings.colors[.none] }
    set {
-      settings.colors[.noValue] = newValue
+      settings.colors[.none] = newValue
      update()
    }
  }
--- a/iphone/Maps/Classes/Components/RatingSummaryView/RatingSummaryViewSettings.swift
+++ b/iphone/Maps/Classes/Components/RatingSummaryView/RatingSummaryViewSettings.swift
@ -3,15 +3,15 @@ import UIKit
 struct RatingSummaryViewSettings {
  enum Default {
    static let backgroundOpacity: CGFloat = 0.16
-    static let colors: [MWMRatingSummaryViewValueType: UIColor] = [
-      .noValue: UIColor.lightGray,
+    static let colors: [UgcSummaryRatingType: UIColor] = [
+      .none: UIColor.lightGray,
      .horrible: UIColor.red,
      .bad: UIColor.orange,
      .normal: UIColor.yellow,
      .good: UIColor.green,
      .excellent: UIColor.blue,
    ]
-    static let images: [MWMRatingSummaryViewValueType: UIImage] = [:]
+    static let images: [UgcSummaryRatingType: UIImage] = [:]
    static let textFont = UIFont.preferredFont(forTextStyle: UIFont.TextStyle.footnote)
    static let textSize = textFont.pointSize
    static let value = "2.2"
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@ -28,8 +28,7 @@
 - (void)openBookmarks;
 - (void)openMapsDownloader:(MWMMapDownloaderMode)mode;
 - (void)openEditor;
- (void)openHotelFacilities;
- (void)openBookmarkEditorWithData:(MWMPlacePageData *)data;
+- (void)openBookmarkEditor;
 - (void)openFullPlaceDescriptionWithHtml:(NSString *)htmlString;
 - (void)showUGCAuth;
 - (void)showBookmarksLoadedAlert:(UInt64)categoryId;
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@ -7,7 +7,6 @@
 #import <CoreApi/MWMBookmarksManager.h>
 #import "MWMEditBookmarkController.h"
 #import "MWMEditorViewController.h"
-#import "MWMFacilitiesController.h"
 #import "MWMFrameworkListener.h"
 #import "MWMFrameworkStorageObserver.h"
 #import "MWMFrameworkObservers.h"
@ -48,7 +47,6 @@ NSString * const kDownloaderSegue = @"Map2MapDownloaderSegue";
 NSString * const kEditorSegue = @"Map2EditorSegue";
 NSString * const kUDViralAlertWasShown = @"ViralAlertWasShown";
 NSString * const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
-NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
 }  // namespace

@interface NSValueWrapper : NSObject
@ -454,7 +452,7 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
 {
  using namespace osm_auth_ios;

-  auto const & featureID = [self.controlsManager.featureHolder featureId];
+  auto const & featureID = GetFramework().GetCurrentPlacePageInfo().GetID();

  [Statistics logEvent:kStatEditorEditStart
        withParameters:@{
@ -466,14 +464,9 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
  [self performSegueWithIdentifier:kEditorSegue sender:self.controlsManager.featureHolder];
 }

- (void)openHotelFacilities
+- (void)openBookmarkEditor
 {
-  [self performSegueWithIdentifier:kHotelFacilitiesSegue sender:self.controlsManager.bookingInfoHolder];
-}
-
- (void)openBookmarkEditorWithData:(MWMPlacePageData *)data
-{
-  [self performSegueWithIdentifier:kPP2BookmarkEditingSegue sender:data];
+  [self performSegueWithIdentifier:kPP2BookmarkEditingSegue sender:nil];
 }

 - (void)openFullPlaceDescriptionWithHtml:(NSString *)htmlString
@ -753,8 +746,8 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
  }
  else if ([segue.identifier isEqualToString:kPP2BookmarkEditingSegue])
  {
-    MWMEditBookmarkController * dvc = segue.destinationViewController;
-    dvc.data = static_cast<MWMPlacePageData *>(sender);
+//    MWMEditBookmarkController * dvc = segue.destinationViewController;
+//    dvc.data = static_cast<MWMPlacePageData *>(sender);
  }
  else if ([segue.identifier isEqualToString:kDownloaderSegue])
  {
@ -772,13 +765,6 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue";
    MWMAuthorizationWebViewLoginViewController * dvc = segue.destinationViewController;
    dvc.authType = MWMWebViewAuthorizationTypeGoogle;
  }
-  else if ([segue.identifier isEqualToString:kHotelFacilitiesSegue])
-  {
-    MWMFacilitiesController * dvc = segue.destinationViewController;
-    auto bookingInfo = id<MWMBookingInfoHolder>(sender);
-    dvc.facilities = bookingInfo.hotelFacilities;
-    dvc.hotelName = bookingInfo.hotelName;
-  }
 }

 #pragma mark - MWMKeyboard
--- a/iphone/Maps/Classes/Share/MWMActivityViewController.h
+++ b/iphone/Maps/Classes/Share/MWMActivityViewController.h
@ -1,4 +1,5 @@
@protocol MWMPlacePageObject;
+@class PlacePageData;

@interface MWMActivityViewController : UIActivityViewController

@ -8,6 +9,8 @@

 + (instancetype)shareControllerForPlacePageObject:(id<MWMPlacePageObject>)object;

+ (instancetype)shareControllerForPlacePage:(PlacePageData *)data;
+
 + (instancetype)shareControllerForURL:(NSURL * _Nullable)url
                              message:(NSString *)message
                    completionHandler:
--- a/iphone/Maps/Classes/Share/MWMActivityViewController.mm
+++ b/iphone/Maps/Classes/Share/MWMActivityViewController.mm
@ -34,14 +34,19 @@
  return shareVC;
 }

-+ (instancetype)shareControllerForPlacePageObject:(id<MWMPlacePageObject>)object
-{
-  MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForPlacePageObject:object];
+ (instancetype)shareControllerForPlacePage:(PlacePageData *)data {
+  MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForPlacePage:data];
  MWMActivityViewController *shareVC = [[self alloc] initWithActivityItem:item];
  shareVC.excludedActivityTypes = [shareVC.excludedActivityTypes arrayByAddingObject:UIActivityTypeAirDrop];
  return shareVC;
 }

+ (instancetype)shareControllerForPlacePageObject:(id<MWMPlacePageObject>)object
+{
+  NSAssert(false, @"deprecated");
+  return nil;
+}
+
 + (instancetype)shareControllerForURL:(NSURL *)url
                              message:(NSString *)message
                    completionHandler:
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.h
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.h
@ -16,9 +16,12 @@ class LatLon;

@end

+@class PlacePageData;
+
@interface MWMShareActivityItem : NSObject<UIActivityItemSource>

 - (instancetype)initForMyPositionAtLocation:(CLLocationCoordinate2D const &)location;
 - (instancetype)initForPlacePageObject:(id<MWMPlacePageObject>)object;
+- (instancetype)initForPlacePage:(PlacePageData *)data;

@end
--- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
+++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm
@ -4,6 +4,9 @@
 #import "3party/Alohalytics/src/alohalytics_objc.h"

 #include <CoreApi/Framework.h>
+#import <CoreApi/PlacePageData.h>
+#import <CoreApi/PlacePagePreviewData.h>
+#import <CoreApi/PlacePageInfoData.h>

 NSString * httpGe0Url(NSString * shortUrl)
 {
@ -13,7 +16,7 @@ NSString * httpGe0Url(NSString * shortUrl)

@interface MWMShareActivityItem ()

-@property(nonatomic) id<MWMPlacePageObject> object;
+@property(nonatomic) PlacePageData *data;
@property(nonatomic) CLLocationCoordinate2D location;
@property(nonatomic) BOOL isMyPosition;

@ -34,13 +37,18 @@ NSString * httpGe0Url(NSString * shortUrl)

 - (instancetype)initForPlacePageObject:(id<MWMPlacePageObject>)object
 {
+  NSAssert(false, @"deprecated");
+
+  return nil;
+}
+
+- (instancetype)initForPlacePage:(PlacePageData *)data {
  self = [super init];
  if (self)
  {
-    NSAssert(object, @"Entity can't be nil!");
-    BOOL const isMyPosition = object.isMyPosition;
-    _isMyPosition = isMyPosition;
-    _object = object;
+    NSAssert(data, @"Entity can't be nil!");
+    _isMyPosition = data.isMyPosition;
+    _data = data;
  }
  return self;
 }
@ -49,23 +57,24 @@ NSString * httpGe0Url(NSString * shortUrl)
 {
  auto & f = GetFramework();

-  auto const title = ^NSString *(id<MWMPlacePageObject> obj)
+  auto const title = ^NSString *(PlacePageData *data)
  {
-    if (!obj || obj.isMyPosition)
+    if (!data || data.isMyPosition)
      return L(@"core_my_position");
-    else if (obj.title.length)
-      return obj.title;
-    else if (obj.subtitle.length)
-      return obj.subtitle;
-    else if (obj.address.length)
-      return obj.address;
+    else if (data.previewData.title.length > 0)
+      return data.previewData.title;
+    else if (data.previewData.subtitle.length)
+      return data.previewData.subtitle;
+    else if (data.previewData.address.length)
+      return data.previewData.address;
    else
      return @"";
  };

-  ms::LatLon const ll = self.object ? self.object.latLon
+  ms::LatLon const ll = self.data ? ms::LatLon(self.data.locationCoordinate.latitude,
+                                               self.data.locationCoordinate.longitude)
                                    : ms::LatLon(self.location.latitude, self.location.longitude);
-  std::string const & s = f.CodeGe0url(ll.m_lat, ll.m_lon, f.GetDrawScale(), title(self.object).UTF8String);
+  std::string const & s = f.CodeGe0url(ll.m_lat, ll.m_lon, f.GetDrawScale(), title(self.data).UTF8String);

  NSString * url = @(s.c_str());
  if (!isShort)
@ -107,7 +116,7 @@ NSString * httpGe0Url(NSString * shortUrl)
  NSString * shortUrl = [self url:YES];
  return [NSString stringWithFormat:@"%@\n%@", httpGe0Url(shortUrl),
                                    self.isMyPosition ? L(@"my_position_share_email_subject")
-                                                      : self.object.title];
+                                                      : self.data.previewData.title];
 }

 - (NSString *)itemDefaultWithActivityType:(NSString *)activityType
@ -124,17 +133,17 @@ NSString * httpGe0Url(NSString * shortUrl)
  }

  NSMutableString * result = [L(@"sharing_call_action_look") mutableCopy];
-  std::vector<NSString *> strings{self.object.title,
-                                 self.object.subtitle,
-                                 self.object.address,
-                                 self.object.phoneNumber,
+  std::vector<NSString *> strings{self.data.previewData.title,
+                                 self.data.previewData.subtitle,
+                                 self.data.previewData.address,
+                                 self.data.infoData.phone,
                                 url,
                                 ge0Url};

-  if (self.object.isBooking)
+  if (self.data.previewData.isBookingPlace)
  {
    strings.push_back(L(@"sharing_booking"));
-    strings.push_back(self.object.sponsoredDescriptionURL.absoluteString);
+    strings.push_back(self.data.sponsoredDescriptionURL);
  }

  for (auto const & str : strings)
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -705,7 +705,7 @@
 		F653CE121C6DEC8E00A453F1 /* MWMDropDown.m in Sources */ = {isa = PBXBuildFile; fileRef = F653CE101C6DEB5A00A453F1 /* MWMDropDown.m */; };
 		F653CE191C71F62700A453F1 /* MWMAddPlaceNavigationBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F653CE151C71F60200A453F1 /* MWMAddPlaceNavigationBar.mm */; };
 		F6550C1F1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6550C1D1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift */; };
-		F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */; };
+		F6558DA21E642CC0002203AE /* MWMFacilitiesController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6558DA01E642CC0002203AE /* MWMFacilitiesController.m */; };
 		F655C027207278300048A241 /* DiscoveryMoreCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F655C026207278300048A241 /* DiscoveryMoreCell.swift */; };
 		F655C02920727A630048A241 /* DiscoveryMoreCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F655C02820727A630048A241 /* DiscoveryMoreCell.xib */; };
 		F65D1E1A20E4F11600FE31DD /* ugc_migration in Resources */ = {isa = PBXBuildFile; fileRef = F65D1E1920E4F11600FE31DD /* ugc_migration */; };
@ -1138,7 +1138,6 @@
 		348B926B1FF3B5E100379009 /* UIView+Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Animation.swift"; sourceTree = "<group>"; };
 		348F8A4D1F863A8500060C2A /* UGCYourReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UGCYourReview.swift; sourceTree = "<group>"; };
 		348F8A511F863B6100060C2A /* UGCReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UGCReview.swift; sourceTree = "<group>"; };
-		348F8A551F864A1700060C2A /* MWMRatingSummaryViewValueType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRatingSummaryViewValueType.h; sourceTree = "<group>"; };
 		3490D2D91CE9DD2500D0B838 /* MWMSideButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideButtons.h; sourceTree = "<group>"; };
 		3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtons.mm; sourceTree = "<group>"; };
 		3490D2DB1CE9DD2500D0B838 /* MWMSideButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideButtonsView.h; sourceTree = "<group>"; };
@ -1889,7 +1888,7 @@
 		F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAddPlaceNavigationBar.xib; sourceTree = "<group>"; };
 		F6550C1D1FD81B3800352D88 /* RatingSummaryView+DefaultConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RatingSummaryView+DefaultConfig.swift"; sourceTree = "<group>"; };
 		F6558D9F1E642CC0002203AE /* MWMFacilitiesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFacilitiesController.h; sourceTree = "<group>"; };
-		F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFacilitiesController.mm; sourceTree = "<group>"; };
+		F6558DA01E642CC0002203AE /* MWMFacilitiesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMFacilitiesController.m; sourceTree = "<group>"; };
 		F655C026207278300048A241 /* DiscoveryMoreCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoveryMoreCell.swift; sourceTree = "<group>"; };
 		F655C02820727A630048A241 /* DiscoveryMoreCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoveryMoreCell.xib; sourceTree = "<group>"; };
 		F6588E2A1B15C26700EE1E58 /* MWMTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTextView.h; sourceTree = "<group>"; };
@ -2787,7 +2786,6 @@
 			children = (
 				344BEAF01F66BDC30045DC45 /* RatingSummaryView.swift */,
 				344BEAF11F66BDC30045DC45 /* RatingSummaryViewSettings.swift */,
-				348F8A551F864A1700060C2A /* MWMRatingSummaryViewValueType.h */,
 			);
 			path = RatingSummaryView;
 			sourceTree = "<group>";
@ -4164,7 +4162,7 @@
 			isa = PBXGroup;
 			children = (
 				F6558D9F1E642CC0002203AE /* MWMFacilitiesController.h */,
-				F6558DA01E642CC0002203AE /* MWMFacilitiesController.mm */,
+				F6558DA01E642CC0002203AE /* MWMFacilitiesController.m */,
 			);
 			name = Controllers;
 			path = ../Controllers;
@ -5530,7 +5528,7 @@
 				47B9065421C7FA400079C85E /* UIImageView+WebImage.m in Sources */,
 				F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
 				34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
-				F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
+				F6558DA21E642CC0002203AE /* MWMFacilitiesController.m in Sources */,
 				33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */,
 				34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */,
 				B366130A20D5E2E000E7DC3E /* CatalogCategoryCell.swift in Sources */,
--- a/iphone/Maps/UI/Discovery/Collection
+++ b/iphone/Maps/UI/Discovery/Collection
@ -67,7 +67,7 @@ final class DiscoveryBookingCell: UICollectionViewCell {
    }
  }

-  private func setRating(_ ratingValue: String, _ ratingType: MWMRatingSummaryViewValueType) {
+  private func setRating(_ ratingValue: String, _ ratingType: UgcSummaryRatingType) {
    rating.value = ratingValue
    rating.type = ratingType
  }
@ -77,7 +77,7 @@ final class DiscoveryBookingCell: UICollectionViewCell {
                    subtitle: String,
                    price: String,
                    ratingValue: String,
-                    ratingType: MWMRatingSummaryViewValueType,
+                    ratingType: UgcSummaryRatingType,
                    distance: String,
                    onBuildRoute: @escaping OnBuildRoute) {
    setAvatar(avatarURL)
--- a/iphone/Maps/UI/Discovery/Collection
+++ b/iphone/Maps/UI/Discovery/Collection
@ -25,7 +25,7 @@ final class DiscoverySearchCell: UICollectionViewCell {
                    distance: String,
                    popular: Bool,
                    ratingValue: String,
-                    ratingType: MWMRatingSummaryViewValueType,
+                    ratingType: UgcSummaryRatingType,
                    tap: @escaping Tap) {
    titleLabel.text = title
    subtitleLabel.text = subtitle
--- a/Models/MWMDiscoveryControllerViewModel.mm
+++ b/Models/MWMDiscoveryControllerViewModel.mm
@ -106,7 +106,7 @@ using namespace discovery;
  NSString *title = result.GetString().empty() ? subtitle : @(result.GetString().c_str());
  
  NSString *ratingValue = [self ratingValueForProductInfo:info];
-  MWMRatingSummaryViewValueType ratingType = [self ratingTypeForProductInfo:info];
+  UgcSummaryRatingType ratingType = [self ratingTypeForProductInfo:info];
  
  NSString *distance = [self distanceFrom:center
                                       to:result.GetFeatureCenter()];
@ -137,7 +137,7 @@ using namespace discovery;
  NSString *price = @(result.GetHotelApproximatePricing().c_str());
  
  NSString *ratingValue = [self ratingValueForProductInfo:info];
-  MWMRatingSummaryViewValueType ratingType = [self ratingTypeForProductInfo:info];
+  UgcSummaryRatingType ratingType = [self ratingTypeForProductInfo:info];
  
  NSString *distance = [self distanceFrom:center
                                       to:result.GetFeatureCenter()];
@ -176,8 +176,8 @@ using namespace discovery;
  return @(place_page::rating::GetRatingFormatted(info.m_ugcRating).c_str());
 }

- (MWMRatingSummaryViewValueType)ratingTypeForProductInfo:(search::ProductInfo const &)info {
-  return (MWMRatingSummaryViewValueType)place_page::rating::GetImpress(info.m_ugcRating);
+- (UgcSummaryRatingType)ratingTypeForProductInfo:(search::ProductInfo const &)info {
+  return (UgcSummaryRatingType)place_page::rating::GetImpress(info.m_ugcRating);
 }

@end
--- a/Models/MWMDiscoveryHotelViewModel.h
+++ b/Models/MWMDiscoveryHotelViewModel.h
@ -1,4 +1,4 @@
-#import "MWMRatingSummaryViewValueType.h"
+#import <CoreApi/UgcSummaryRatingType.h>

 NS_ASSUME_NONNULL_BEGIN

@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) NSString *distance;
@property(nonatomic, readonly) BOOL isPopular;
@property(nonatomic, readonly) NSString *ratingValue;
-@property(nonatomic, readonly) MWMRatingSummaryViewValueType ratingType;
+@property(nonatomic, readonly) UgcSummaryRatingType ratingType;

 - (instancetype)initWithTitle:(NSString *)title
                     subtitle:(NSString *)subtitle
@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
                     distance:(NSString *)distance
                    isPopular:(BOOL)isPopular
                  ratingValue:(NSString *) ratingValue
-                   ratingType:(MWMRatingSummaryViewValueType)ratingType;
+                   ratingType:(UgcSummaryRatingType)ratingType;

@end

--- a/Models/MWMDiscoveryHotelViewModel.m
+++ b/Models/MWMDiscoveryHotelViewModel.m
@ -8,7 +8,7 @@
@property(nonatomic, readwrite) NSString *distance;
@property(nonatomic, readwrite) BOOL isPopular;
@property(nonatomic, readwrite) NSString *ratingValue;
-@property(nonatomic, readwrite) MWMRatingSummaryViewValueType ratingType;
+@property(nonatomic, readwrite) UgcSummaryRatingType ratingType;

@end

@ -20,7 +20,7 @@
                     distance:(NSString *)distance
                    isPopular:(BOOL)isPopular
                  ratingValue:(NSString *) ratingValue
-                   ratingType:(MWMRatingSummaryViewValueType)ratingType {
+                   ratingType:(UgcSummaryRatingType)ratingType {
  self = [super init];
  if (self) {
    self.title = title;
--- a/Models/MWMDiscoverySearchViewModel.h
+++ b/Models/MWMDiscoverySearchViewModel.h
@ -1,4 +1,4 @@
-#import "MWMRatingSummaryViewValueType.h"
+#import <CoreApi/UgcSummaryRatingType.h>

 NS_ASSUME_NONNULL_BEGIN

@ -9,14 +9,14 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) NSString *distance;
@property(nonatomic, readonly) BOOL isPopular;
@property(nonatomic, readonly) NSString *ratingValue;
-@property(nonatomic, readonly) MWMRatingSummaryViewValueType ratingType;
+@property(nonatomic, readonly) UgcSummaryRatingType ratingType;

 - (instancetype)initWithTitle:(NSString *)title
                     subtitle:(NSString *)subtitle
                     distance:(NSString *)distance
                    isPopular:(BOOL)isPopular
                  ratingValue:(NSString *) ratingValue
-                   ratingType:(MWMRatingSummaryViewValueType)ratingType;
+                   ratingType:(UgcSummaryRatingType)ratingType;
@end

 NS_ASSUME_NONNULL_END
--- a/Models/MWMDiscoverySearchViewModel.m
+++ b/Models/MWMDiscoverySearchViewModel.m
@ -1,4 +1,5 @@
 #import "MWMDiscoverySearchViewModel.h"
+#import <CoreApi/UgcSummaryRatingType.h>

@interface MWMDiscoverySearchViewModel()

@ -7,7 +8,7 @@
@property(nonatomic, readwrite) NSString *distance;
@property(nonatomic, readwrite) BOOL isPopular;
@property(nonatomic, readwrite) NSString *ratingValue;
-@property(nonatomic, readwrite) MWMRatingSummaryViewValueType ratingType;
+@property(nonatomic, readwrite) UgcSummaryRatingType ratingType;

@end

@ -18,7 +19,7 @@
                     distance:(NSString *)distance
                    isPopular:(BOOL)isPopular
                  ratingValue:(NSString *) ratingValue
-                   ratingType:(MWMRatingSummaryViewValueType)ratingType {
+                   ratingType:(UgcSummaryRatingType)ratingType {
  self = [super init];
  if (self) {
    self.title = title;
--- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.h
+++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.h
@ -1,9 +1,5 @@
 #import "MWMTableViewController.h"

-@class MWMPlacePageData;
-
@interface MWMEditBookmarkController : MWMTableViewController

-@property(weak, nonatomic) MWMPlacePageData * data;
-
@end
--- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm
+++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm
@ -50,14 +50,13 @@ enum RowInMetaInfo
 {
  [super viewDidLoad];
  self.cachedNewBookmarkCatId = kml::kInvalidMarkGroupId;
-  auto data = self.data;
-  NSAssert(data, @"Data can't be nil!");
-  self.cachedDescription = data.bookmarkDescription;
-  self.cachedTitle = data.title;
-  self.cachedCategory = data.bookmarkCategory;
-  self.cachedColor = data.bookmarkColor;
-  m_cachedBookmarkId = data.bookmarkId;
-  m_cachedBookmarkCatId = data.bookmarkCategoryId;
+  auto const & info = GetFramework().GetCurrentPlacePageInfo();
+  self.cachedDescription = @(GetPreferredBookmarkStr(info.GetBookmarkData().m_description).c_str());
+  self.cachedTitle = info.GetTitle().empty() ? nil : @(info.GetTitle().c_str());
+  self.cachedCategory = @(info.GetBookmarkCategoryName().c_str());
+  self.cachedColor = info.GetBookmarkData().m_color.m_predefinedColor;
+  m_cachedBookmarkId = info.GetBookmarkId();
+  m_cachedBookmarkCatId = info.GetBookmarkCategoryId();
  [self configNavBar];
  [self registerCells];
 }
@ -248,7 +247,7 @@ enum RowInMetaInfo

 - (void)cellSelect:(UITableViewCell *)cell
 {
-  [self.data updateBookmarkStatus:NO];
+  [[MWMBookmarksManager sharedManager] deleteBookmark:m_cachedBookmarkId];
  GetFramework().UpdatePlacePageInfoForCurrentSelection();
  [self goBack];
 }
--- a/iphone/Maps/UI/PlacePage/ActionBarViewController.swift
+++ b/iphone/Maps/UI/PlacePage/ActionBarViewController.swift
@ -1,3 +1,6 @@
+protocol ActionBarViewControllerDelegate: AnyObject {
+  func actionBarDidPressButton(_ type: ActionBarButtonType)
+}

 class ActionBarViewController: UIViewController {
  @IBOutlet var stackView: UIStackView!
@ -9,6 +12,8 @@ class ActionBarViewController: UIViewController {
  private var visibleButtons: [ActionBarButtonType] = []
  private var additionalButtons: [ActionBarButtonType] = []

+  weak var delegate: ActionBarViewControllerDelegate?
+
  override func viewDidLoad() {
    super.viewDidLoad()

@ -23,12 +28,12 @@ class ActionBarViewController: UIViewController {
      if buttonType == .bookmark {
        if let bookmarkData = placePageData.bookmarkData {
          selected = true
-          disabled = bookmarkData.isEditable
+          disabled = !bookmarkData.isEditable
        }
      }
      guard let button = ActionBarButton(delegate: self,
                                         buttonType: buttonType,
-                                         partnerIndex: -1,
+                                         partnerIndex: placePageData.partnerIndex,
                                         isSelected: selected,
                                         isDisabled: disabled) else { continue }
      stackView.addArrangedSubview(button)
@ -43,7 +48,7 @@ class ActionBarViewController: UIViewController {
    if placePageData.previewData.isBookingPlace {
      buttons.append(.booking)
    }
-    if placePageData.sponsoredType == .partner {
+    if placePageData.isPartner {
      buttons.append(.partner)
    }
    if placePageData.bookingSearchUrl != nil {
@ -89,10 +94,29 @@ class ActionBarViewController: UIViewController {
      visibleButtons.append(.more)
    }
  }
+
+  private func showMore() {
+    let actionSheet = UIAlertController(title: placePageData.previewData.title,
+                                        message: placePageData.previewData.subtitle,
+                                        preferredStyle: .actionSheet)
+    for button in additionalButtons {
+      actionSheet.addAction(UIAlertAction(title: titleForButton(button, placePageData.partnerIndex, false),
+                                          style: .default,
+                                          handler: { [weak self] _ in
+                                            self?.delegate?.actionBarDidPressButton(button)
+      }))
+    }
+    actionSheet.addAction(UIAlertAction(title: L("cancel"), style: .cancel))
+    present(actionSheet, animated: true)
+  }
 }

 extension ActionBarViewController: ActionBarButtonDelegate {
  func tapOnButton(with type: ActionBarButtonType) {
-    
+    if type == .more {
+      showMore()
+      return
+    }
+    delegate?.actionBarDidPressButton(type)
  }
 }
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
@ -1,6 +1,7 @@
 #import "MWMPlacePageTaxiProvider.h"
-#import "MWMRatingSummaryViewValueType.h"
 #import "MWMUGCReviewSource.h"
+#import <CoreApi/UgcSummaryRatingType.h>
+#import <CoreApi/PlacePageData.h>

 typedef UIView * _Nullable (^MWMPlacePageButtonsDismissBlock)(NSInteger);

@ -16,20 +17,17 @@ typedef UIView * _Nullable (^MWMPlacePageButtonsDismissBlock)(NSInteger);
 - (void)openMoreUrl;
 - (void)openReviewUrl;
 - (void)editBookmark;
- (void)orderTaxi:(MWMPlacePageTaxiProvider)provider;
 - (void)showAllFacilities;
 - (void)showPhotoAtIndex:(NSInteger)index
                         referenceView:(UIView * _Nullable)referenceView
    referenceViewWhenDismissingHandler:
        (nonnull MWMPlacePageButtonsDismissBlock)referenceViewWhenDismissingHandler;
 - (void)showGallery;
- (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromSource:(MWMUGCReviewSource)source;
+- (void)showUGCAddReview:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source;
 - (void)searchSimilar;

 - (void)openLocalAdsURL;

- (void)openSponsoredURL:(NSURL * _Nullable)url;
-
 - (void)openReviews:(id<MWMReviewsViewModelProtocol> _Nonnull)reviewsViewModel;

 - (void)showPlaceDescription:(NSString * _Nonnull)htmlString;
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
@ -1,5 +1,4 @@
 #import "MWMPlacePageActionBar.h"
-#import "MWMRatingSummaryViewValueType.h"

 #include "partners_api/taxi_provider.hpp"

@ -11,6 +10,8 @@
 #include "platform/network_policy.hpp"

 #include <optional>
+#import <CoreApi/UgcSummaryRatingType.h>
+
 #include <vector>

@class MWMPlacePageData;
@ -278,7 +279,7 @@ typedef void (^RefreshPromoCallbackBlock)(NSIndexSet *insertedSections);
 - (BOOL)isPreviewPlus;
 - (BOOL)isPartnerAppInstalled;

-+ (MWMRatingSummaryViewValueType)ratingValueType:(place_page::rating::Impress)impress;
+ (UgcSummaryRatingType)ratingValueType:(place_page::rating::Impress)impress;

 // Coordinates
 - (m2::PointD const &)mercator;
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@ -844,16 +844,16 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
  return [UIApplication.sharedApplication canOpenURL:self.deepLink];
 }

-+ (MWMRatingSummaryViewValueType)ratingValueType:(rating::Impress)impress
+ (UgcSummaryRatingType)ratingValueType:(rating::Impress)impress
 {
  switch (impress)
  {
-  case rating::Impress::None: return MWMRatingSummaryViewValueTypeNoValue;
-  case rating::Impress::Horrible: return MWMRatingSummaryViewValueTypeHorrible;
-  case rating::Impress::Bad: return MWMRatingSummaryViewValueTypeBad;
-  case rating::Impress::Normal: return MWMRatingSummaryViewValueTypeNormal;
-  case rating::Impress::Good: return MWMRatingSummaryViewValueTypeGood;
-  case rating::Impress::Excellent: return MWMRatingSummaryViewValueTypeExcellent;
+  case rating::Impress::None: return UgcSummaryRatingTypeNone;
+  case rating::Impress::Horrible: return UgcSummaryRatingTypeHorrible;
+  case rating::Impress::Bad: return UgcSummaryRatingTypeBad;
+  case rating::Impress::Normal: return UgcSummaryRatingTypeNormal;
+  case rating::Impress::Good: return UgcSummaryRatingTypeGood;
+  case rating::Impress::Excellent: return UgcSummaryRatingTypeExcellent;
  }
 }
 #pragma mark - Coordinates
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@ -1,6 +1,7 @@
 #import "MWMPlacePageManager.h"
 #import "CLLocation+Mercator.h"
 #import "MWMActivityViewController.h"
+#import "MWMFacilitiesController.h"
 #import "MWMFrameworkListener.h"
 #import "MWMFrameworkStorageObserver.h"
 #import "MWMLocationHelpers.h"
@ -24,6 +25,32 @@ using namespace storage;

 namespace
 {
+void logSponsoredEvent(PlacePageData *data, NSString *eventName)
+{
+  NSMutableDictionary *stat = [NSMutableDictionary dictionary];
+  if (data.hotelBooking != nil)
+  {
+    stat[kStatProvider] = kStatBooking;
+    stat[kStatHotel] = data.hotelBooking.hotelId;
+    stat[kStatHotelLocation] = makeLocationEventValue(data.locationCoordinate.latitude,
+                                                      data.locationCoordinate.longitude);
+  }
+  else if (data.isPartner)
+  {
+    stat[kStatProvider] = data.partnerName;
+    stat[kStatObjectLat] = @(data.locationCoordinate.latitude);
+    stat[kStatObjectLon] = @(data.locationCoordinate.longitude);
+  }
+  else
+  {
+    stat[kStatProvider] = kStatPlacePageHotelSearch;
+    stat[kStatHotelLocation] = makeLocationEventValue(data.locationCoordinate.latitude,
+                                                      data.locationCoordinate.longitude);
+  }
+
+  [Statistics logEvent:eventName withParameters:stat atLocation:[MWMLocationManager lastLocation]];
+}
+
 void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
 {
  auto const & latLon = data.latLon;
@ -57,9 +84,10 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
  [Statistics logEvent:eventName withParameters:stat atLocation:[MWMLocationManager lastLocation]];
 }

-void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page::Info const & info)
+void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
 {
  auto const userPos = GetFramework().GetCurrentPosition();
+  auto const & info = GetFramework().GetCurrentPlacePageInfo();
  utils::RegisterEyeEventIfPossible(type, userPos, info);
 }
 }  // namespace
@ -81,7 +109,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:

 - (void)showReview {
  [self show];
-  [self showUGCAddReview:MWMRatingSummaryViewValueTypeNoValue
+  [self showUGCAddReview:UgcSummaryRatingTypeNone
              fromSource:MWMUGCReviewSourceNotification];
 }

@ -329,6 +357,16 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
 }

 - (void)mwm_refreshUI { [self.layout mwm_refreshUI]; }
+
+- (void)routeFrom:(PlacePageData *)data {
+  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
+        withParameters:@{kStatValue : kStatSource}];
+
+  MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeStart intermediateIndex:0];
+  [MWMRouter buildFromPoint:point bestRouter:YES];
+  [self closePlacePage];
+}
+
 - (void)routeFrom
 {
  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
@ -339,6 +377,23 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self closePlacePage];
 }

+- (void)routeTo:(PlacePageData *)data {
+  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
+        withParameters:@{kStatValue : kStatDestination}];
+
+  if ([MWMRouter isOnRoute]) {
+    [MWMRouter stopRouting];
+  }
+
+  if ([MWMTrafficManager transitEnabled]) {
+    [MWMRouter setType:MWMRouterTypePublicTransport];
+  }
+
+  MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeFinish intermediateIndex:0];
+  [MWMRouter buildToPoint:point bestRouter:YES];
+  [self closePlacePage];
+}
+
 - (void)routeTo
 {
  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBuildRoute)
@ -346,15 +401,21 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:

  if ([MWMRouter isOnRoute])
    [MWMRouter stopRouting];
-  
+
  if ([MWMTrafficManager transitEnabled])
    [MWMRouter setType:MWMRouterTypePublicTransport];
-  
+
  MWMRoutePoint * point = [self routePointWithType:MWMRoutePointTypeFinish intermediateIndex:0];
  [MWMRouter buildToPoint:point bestRouter:YES];
  [self closePlacePage];
 }

+- (void)routeAddStop:(PlacePageData *)data {
+  MWMRoutePoint *point = [self routePoint:data withType:MWMRoutePointTypeIntermediate intermediateIndex:0];
+  [MWMRouter addPointAndRebuild:point];
+  [self closePlacePage];
+}
+
 - (void)routeAddStop
 {
  MWMRoutePoint * point =
@ -363,51 +424,134 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self closePlacePage];
 }

- (void)routeRemoveStop
-{
-  auto data = self.data;
-  MWMRoutePoint * point = nil;
-  switch (data.routeMarkType)
-  {
+- (void)routeRemoveStop:(PlacePageData *)data {
+  MWMRoutePoint *point = nil;
+  auto const intermediateIndex = GetFramework().GetCurrentPlacePageInfo().GetIntermediateIndex();
+  switch (GetFramework().GetCurrentPlacePageInfo().GetRouteMarkType()) {
  case RouteMarkType::Start:
-    point =
-        [self routePointWithType:MWMRoutePointTypeStart intermediateIndex:data.intermediateIndex];
+    point = [self routePoint:data withType:MWMRoutePointTypeStart intermediateIndex:intermediateIndex];
    break;
  case RouteMarkType::Finish:
-    point =
-        [self routePointWithType:MWMRoutePointTypeFinish intermediateIndex:data.intermediateIndex];
+    point = [self routePoint:data withType:MWMRoutePointTypeFinish intermediateIndex:intermediateIndex];
    break;
  case RouteMarkType::Intermediate:
-    point = [self routePointWithType:MWMRoutePointTypeIntermediate
-                   intermediateIndex:data.intermediateIndex];
+    point = [self routePoint:data withType:MWMRoutePointTypeIntermediate intermediateIndex:intermediateIndex];
    break;
  }
  [MWMRouter removePointAndRebuild:point];
  [self closePlacePage];
 }

- (void)orderTaxi:(MWMPlacePageTaxiProvider)provider
+- (void)routeRemoveStop
 {
-  auto data = self.data;
-  if (!data)
-    return;
-  NSString * providerString = nil;
-  switch (provider)
+  MWMRoutePoint * point = nil;
+  auto const intermediateIndex = GetFramework().GetCurrentPlacePageInfo().GetIntermediateIndex();
+  switch (GetFramework().GetCurrentPlacePageInfo().GetRouteMarkType())
  {
-  case MWMPlacePageTaxiProviderTaxi: providerString = kStatUnknown; break;
-  case MWMPlacePageTaxiProviderUber: providerString = kStatUber; break;
-  case MWMPlacePageTaxiProviderYandex: providerString = kStatYandex; break;
-  case MWMPlacePageTaxiProviderMaxim: providerString = kStatMaxim; break;
-  case MWMPlacePageTaxiProviderVezet: providerString = kStatVezet; break;
+  case RouteMarkType::Start:
+    point =
+        [self routePointWithType:MWMRoutePointTypeStart intermediateIndex:intermediateIndex];
+    break;
+  case RouteMarkType::Finish:
+    point =
+        [self routePointWithType:MWMRoutePointTypeFinish intermediateIndex:intermediateIndex];
+    break;
+  case RouteMarkType::Intermediate:
+    point = [self routePointWithType:MWMRoutePointTypeIntermediate
+                   intermediateIndex:intermediateIndex];
+    break;
  }
+  [MWMRouter removePointAndRebuild:point];
+  [self closePlacePage];
+}
+
+- (void)orderTaxi:(PlacePageData *)data
+{
+  NSString * providerString = nil;
+  switch (data.taxiProvider)
+  {
+  case PlacePageTaxiProviderNone: providerString = kStatUnknown; break;
+  case PlacePageTaxiProviderUber: providerString = kStatUber; break;
+  case PlacePageTaxiProviderYandex: providerString = kStatYandex; break;
+  case PlacePageTaxiProviderMaxim: providerString = kStatMaxim; break;
+  case PlacePageTaxiProviderRutaxi: providerString = kStatVezet; break;
+  }
+
  [Statistics logEvent:kStatPlacePageTaxiClick
        withParameters:@{kStatProvider : providerString, kStatTags : data.statisticsTags}];
  [MWMRouter setType:MWMRouterTypeTaxi];
-  MWMRoutePoint * point = [self routePointWithType:MWMRoutePointTypeFinish intermediateIndex:0];
+  MWMRoutePoint * point = [self routePointWithData:data pointType:MWMRoutePointTypeFinish intermediateIndex:0];
  [MWMRouter buildToPoint:point bestRouter:NO];
  [self closePlacePage];
 }

+- (MWMRoutePoint *)routePointWithData:(PlacePageData *)data
+                                 pointType:(MWMRoutePointType)type
+                    intermediateIndex:(size_t)intermediateIndex
+{
+  if (data.isMyPosition) {
+    return [[MWMRoutePoint alloc] initWithLastLocationAndType:type intermediateIndex:intermediateIndex];
+  }
+
+  NSString *title = nil;
+  if (data.previewData.title.length > 0) {
+    title = data.previewData.title;
+  } else if (data.previewData.address.length > 0) {
+    title = data.previewData.address;
+  } else if (data.previewData.subtitle.length > 0) {
+    title = data.previewData.subtitle;
+  } else if (data.bookmarkData != nil) {
+    title = data.bookmarkData.externalTitle;
+  } else {
+    title = L(@"core_placepage_unknown_place");
+  }
+
+  NSString * subtitle = nil;
+  if (data.previewData.subtitle.length > 0 && ![title isEqualToString:data.previewData.subtitle]) {
+    subtitle = data.previewData.subtitle;
+  }
+
+  return [[MWMRoutePoint alloc] initWithPoint:location_helpers::ToMercator(data.locationCoordinate)
+                                        title:title
+                                     subtitle:subtitle
+                                         type:type
+                            intermediateIndex:intermediateIndex];
+}
+
+- (MWMRoutePoint *)routePoint:(PlacePageData *)data
+                     withType:(MWMRoutePointType)type
+                    intermediateIndex:(size_t)intermediateIndex
+{
+  if (data.isMyPosition) {
+    return [[MWMRoutePoint alloc] initWithLastLocationAndType:type
+                                            intermediateIndex:intermediateIndex];
+  }
+
+  NSString *title = nil;
+  if (data.previewData.title.length > 0) {
+    title = data.previewData.title;
+  } else if (data.previewData.address.length > 0) {
+    title = data.previewData.address;
+  } else if (data.previewData.subtitle.length > 0) {
+    title = data.previewData.subtitle;
+  } else if (data.bookmarkData != nil) {
+    title = data.bookmarkData.externalTitle;
+  } else {
+    title = L(@"core_placepage_unknown_place");
+  }
+
+  NSString * subtitle = nil;
+  if (data.previewData.subtitle.length > 0 && ![title isEqualToString:data.previewData.subtitle]) {
+    subtitle = data.previewData.subtitle;
+  }
+
+  return [[MWMRoutePoint alloc] initWithPoint:location_helpers::ToMercator(data.locationCoordinate)
+                                        title:title
+                                     subtitle:subtitle
+                                         type:type
+                            intermediateIndex:intermediateIndex];
+}
+
 - (MWMRoutePoint *)routePointWithType:(MWMRoutePointType)type
                    intermediateIndex:(size_t)intermediateIndex
 {
@ -442,6 +586,13 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
                            intermediateIndex:intermediateIndex];
 }

+
+- (void)share:(PlacePageData *)data {
+  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatShare)];
+  MWMActivityViewController * shareVC = [MWMActivityViewController shareControllerForPlacePage:data];
+  [shareVC presentInParentViewController:self.ownerViewController anchorView:self.layout.shareAnchor];
+}
+
 - (void)share
 {
  auto data = self.data;
@ -477,17 +628,62 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [[MWMMapViewControlsManager manager] addPlace:NO hasPoint:YES point:data.mercator];
 }

+- (void)addPlace:(CLLocationCoordinate2D)coordinate
+{
+  [Statistics logEvent:kStatEditorAddClick
+        withParameters:@{kStatValue : kStatPlacePageNonBuilding}];
+  [[MWMMapViewControlsManager manager] addPlace:NO hasPoint:YES point:location_helpers::ToMercator(coordinate)];
+}
+
+- (void)addBookmark:(PlacePageData *)data {
+  RegisterEventIfPossible(eye::MapObject::Event::Type::AddToBookmark);
+  [Statistics logEvent:kStatBookmarkCreated];
+
+  auto &f = GetFramework();
+  auto &bmManager = f.GetBookmarkManager();
+  auto &info = f.GetCurrentPlacePageInfo();
+  auto const categoryId = f.LastEditedBMCategory();
+  kml::BookmarkData bmData;
+  bmData.m_name = info.FormatNewBookmarkName();
+  bmData.m_color.m_predefinedColor = f.LastEditedBMColor();
+  bmData.m_point = info.GetMercator();
+  if (info.IsFeature()) {
+    SaveFeatureTypes(info.GetTypes(), bmData);
+  }
+  auto editSession = bmManager.GetEditSession();
+  auto const *bookmark = editSession.CreateBookmark(std::move(bmData), categoryId);
+
+  auto buildInfo = info.GetBuildInfo();
+  buildInfo.m_match = place_page::BuildInfo::Match::Everything;
+  buildInfo.m_userMarkId = bookmark->GetId();
+  f.UpdatePlacePageInfoForCurrentSelection(buildInfo);
+}
+
 - (void)addBookmark
 {
  auto data = self.data;
  if (!data)
    return;
-  RegisterEventIfPossible(eye::MapObject::Event::Type::AddToBookmark, data.getRawData);
+  RegisterEventIfPossible(eye::MapObject::Event::Type::AddToBookmark);
  [Statistics logEvent:kStatBookmarkCreated];
  [data updateBookmarkStatus:YES];
  [self.layout reloadBookmarkSection:YES];
 }

+- (void)removeBookmark:(PlacePageData *)data
+{
+  [Statistics logEvent:kStatEventName(kStatPlacePage, kStatBookmarks)
+        withParameters:@{kStatValue : kStatRemove}];
+
+  auto &f = GetFramework();
+  f.GetBookmarkManager().GetEditSession().DeleteBookmark(data.bookmarkData.bookmarkId);
+
+  auto buildInfo = f.GetCurrentPlacePageInfo().GetBuildInfo();
+  buildInfo.m_match = place_page::BuildInfo::Match::FeatureOnly;
+  buildInfo.m_userMarkId = kml::kInvalidMarkId;
+  f.UpdatePlacePageInfoForCurrentSelection(buildInfo);
+}
+
 - (void)removeBookmark
 {
  auto data = self.data;
@ -499,6 +695,12 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self.layout reloadBookmarkSection:NO];
 }

+- (void)call:(PlacePageData *)data {
+  if (data.infoData.phoneUrl && [UIApplication.sharedApplication canOpenURL:data.infoData.phoneUrl]) {
+    [UIApplication.sharedApplication openURL:data.infoData.phoneUrl options:@{} completionHandler:nil];
+  }
+}
+
 - (void)call
 {
  MWMPlacePageData *data = self.data;
@ -513,11 +715,8 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  }
 }

- (void)editBookmark
-{
-  auto data = self.data;
-  if (data)
-    [self.ownerViewController openBookmarkEditorWithData:data];
+- (void)editBookmark {
+  [self.ownerViewController openBookmarkEditor];
 }

 - (void)showPlaceDescription:(NSString *)htmlString
@ -525,6 +724,26 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self.ownerViewController openFullPlaceDescriptionWithHtml:htmlString];
 }

+- (void)openPartner:(PlacePageData *)data withStatisticLog:(NSString *)eventName proposedUrl:(NSURL *)proposedUrl
+{
+  logSponsoredEvent(data, eventName);
+
+  NSURL *deeplink = [NSURL URLWithString:data.sponsoredDeeplink];
+  if (deeplink != nil && [UIApplication.sharedApplication canOpenURL:deeplink]) {
+    [UIApplication.sharedApplication openURL:deeplink options:@{} completionHandler:nil];
+  } else if (proposedUrl != nil) {
+    [UIApplication.sharedApplication openURL:proposedUrl options:@{} completionHandler:nil];
+  } else {
+    NSAssert(proposedUrl, @"Sponsored url can't be nil!");
+    return;
+  }
+
+  if (data.previewData.isBookingPlace) {
+    auto mercator = location_helpers::ToMercator(data.locationCoordinate);
+    [MWMEye transitionToBookingWithPos:CGPointMake(mercator.x, mercator.y)];
+  }
+}
+
 - (void)openPartnerWithStatisticLog:(NSString *)eventName proposedUrl:(NSURL *)proposedUrl
 {
  auto data = self.data;
@ -542,6 +761,11 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
    [MWMEye transitionToBookingWithPos:CGPointMake(data.mercator.x, data.mercator.y)];
 }

+- (void)book:(PlacePageData *)data {
+  NSURL *url = [NSURL URLWithString:data.sponsoredURL];
+  [self openPartner:data withStatisticLog:kStatPlacePageHotelBook proposedUrl:url];
+}
+
 - (void)book
 {
  auto data = self.data;
@ -565,16 +789,30 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self openPartnerWithStatisticLog:eventName proposedUrl:data.sponsoredURL];
 }

+- (void)openDescriptionUrl:(PlacePageData *)data {
+  NSURL *url = [NSURL URLWithString:data.sponsoredDescriptionURL];
+  [self openPartner:data withStatisticLog:kStatPlacePageHotelDetails proposedUrl:url];
+}
+
 - (void)openDescriptionUrl
 {
  auto data = self.data;
  if (!data)
    return;
- 
+
 [self openPartnerWithStatisticLog:kStatPlacePageHotelDetails
                       proposedUrl:data.sponsoredDescriptionURL];
 }

+- (void)openMoreUrl:(PlacePageData *)data {
+  NSURL *url = [NSURL URLWithString:data.sponsoredMoreURL];
+  if (!url) { return; }
+  logSponsoredEvent(data, kStatPlacePageHotelMore);
+  [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
+  auto mercator = location_helpers::ToMercator(data.locationCoordinate);
+  [MWMEye transitionToBookingWithPos:CGPointMake(mercator.x, mercator.y)];
+}
+
 - (void)openMoreUrl
 {
  auto data = self.data;
@ -587,12 +825,17 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [MWMEye transitionToBookingWithPos:CGPointMake(data.mercator.x, data.mercator.y)];
 }

+- (void)openReviewUrl:(PlacePageData *)data {
+  NSURL *url = [NSURL URLWithString:data.sponsoredReviewURL];
+  [self openPartner:data withStatisticLog:kStatPlacePageHotelReviews proposedUrl:url];
+}
+
 - (void)openReviewUrl
 {
  auto data = self.data;
  if (!data)
    return;
-  
+
  [self openPartnerWithStatisticLog:kStatPlacePageHotelReviews
                        proposedUrl:data.sponsoredReviewURL];
 }
@ -609,6 +852,14 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
 }

+- (void)openPartner:(PlacePageData *)data
+{
+  logSponsoredEvent(data, kStatPlacePageSponsoredActionButtonClick);
+  NSURL *url = [NSURL URLWithString:data.sponsoredURL];
+  NSAssert(url, @"Partner url can't be nil!");
+  [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
+}
+
 - (void)openPartner
 {
  auto data = self.data;
@ -676,7 +927,42 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [[MapViewController sharedController].navigationController pushViewController:galleryVc animated:YES];
 }

- (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromSource:(MWMUGCReviewSource)source
+- (void)showUGCAddReview:(PlacePageData *)data rating:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source
+{
+  NSMutableArray *ratings = [NSMutableArray array];
+  for (NSString *cat in data.ratingCategories) {
+    [ratings addObject:[[MWMUGCRatingStars alloc] initWithTitle:cat
+                                                          value:value
+                                                       maxValue:5.0f]];
+  }
+
+  RegisterEventIfPossible(eye::MapObject::Event::Type::UgcEditorOpened);
+  NSString * sourceString;
+  switch (source) {
+    case MWMUGCReviewSourcePlacePage:
+      sourceString = kStatPlacePage;
+      break;
+    case MWMUGCReviewSourcePlacePagePreview:
+      sourceString = kStatPlacePagePreview;
+      break;
+    case MWMUGCReviewSourceNotification:
+      sourceString = kStatNotification;
+      break;
+  }
+  [Statistics logEvent:kStatUGCReviewStart
+        withParameters:@{
+          kStatIsAuthenticated: @([MWMAuthorizationViewModel isAuthenticated]),
+          kStatIsOnline: @(GetPlatform().ConnectionStatus() != Platform::EConnectionType::CONNECTION_NONE),
+          kStatMode: kStatAdd,
+          kStatFrom: sourceString
+        }];
+  auto ugcReviewModel =
+      [[MWMUGCReviewModel alloc] initWithReviewValue:value ratings:ratings title:data.previewData.title text:@""];
+  auto ugcVC = [MWMUGCAddReviewController instanceWithModel:ugcReviewModel saver:self];
+  [[MapViewController sharedController].navigationController pushViewController:ugcVC animated:YES];
+}
+
+- (void)showUGCAddReview:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source
 {
  auto data = self.data;
  if (!data)
@ -689,7 +975,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
                                                       maxValue:5.0f]];
  auto title = data.title;

-  RegisterEventIfPossible(eye::MapObject::Event::Type::UgcEditorOpened, data.getRawData);
+  RegisterEventIfPossible(eye::MapObject::Event::Type::UgcEditorOpened);
  NSString * sourceString;
  switch (source) {
    case MWMUGCReviewSourcePlacePage:
@ -721,11 +1007,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [Statistics logEvent:@"Placepage_Hotel_search_similar"
        withParameters:@{kStatProvider : self.data.isBooking ? kStatBooking : kStatOSM}];

-  auto data = self.data;
-  if (!data)
-    return;
-  
-  MWMHotelParams * params = [[MWMHotelParams alloc] initWithPlacePageData:data];
+  MWMHotelParams * params = [[MWMHotelParams alloc] init];
  [[MWMSearchManager manager] showHotelFilterWithParams:params
                      onFinishCallback:^{
    [MWMMapViewControlsManager.manager searchTextOnMap:[L(@"booking_hotel") stringByAppendingString:@" "]
@ -733,13 +1015,35 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  }];
 }

+- (void)showAllFacilities:(PlacePageData *)data {
+  logSponsoredEvent(data, kStatPlacePageHotelFacilities);
+  MWMFacilitiesController *vc = [[MWMFacilitiesController alloc] init];
+  vc.name = data.previewData.title;
+  vc.facilities = data.hotelBooking.facilities;
+  [[MapViewController sharedController].navigationController pushViewController:vc animated:YES];
+}
+
 - (void)showAllFacilities
 {
-  auto data = self.data;
-  if (!data)
+  NSAssert(false, @"deprecated");
+}
+
+- (void)openLocalAdsURL:(PlacePageData *)data
+{
+  NSURL *url = [NSURL URLWithString:data.infoData.localAdsUrl];
+  if (!url)
    return;
-  logSponsoredEvent(data, kStatPlacePageHotelFacilities);
-  [self.ownerViewController openHotelFacilities];
+
+  auto const & feature = GetFramework().GetCurrentPlacePageInfo().GetID();
+  [Statistics logEvent:kStatPlacePageOwnershipButtonClick
+        withParameters:@{
+                         @"mwm_name" : @(feature.GetMwmName().c_str()),
+                         @"mwm_version" : @(feature.GetMwmVersion()),
+                         @"feature_id" : @(feature.m_index)
+                         }
+            atLocation:[MWMLocationManager lastLocation]];
+
+  [self.ownerViewController openUrl:url];
 }

 - (void)openLocalAdsURL
@ -763,11 +1067,11 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [self.ownerViewController openUrl:url];
 }

- (void)openSponsoredURL:(nullable NSURL *)url
-{
-  if (auto u = url ?: self.data.sponsoredURL)
-    [self.ownerViewController openUrl:u];
-}
+//- (void)openSponsoredURL:(nullable NSURL *)url
+//{
+//  if (auto u = url ?: self.data.sponsoredURL)
+//    [self.ownerViewController openUrl:u];
+//}

 - (void)openReviews:(id<MWMReviewsViewModelProtocol> _Nonnull)reviewsViewModel
 {
@ -775,6 +1079,36 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
  [[MapViewController sharedController].navigationController pushViewController:reviewsVC animated:YES];
 }

+- (void)openWebsite:(PlacePageData *)data {
+  NSURL *url = [NSURL URLWithString:data.infoData.website];
+  if (url) {
+    [self.ownerViewController openUrl:url];
+    //TODO: add local ads events
+  }
+}
+
+- (void)openCatalogSingleItem:(PlacePageData *)data atIndex:(NSInteger)index {
+  [Statistics logEvent:kStatPlacepageSponsoredItemSelected
+        withParameters:@{
+                         kStatProvider: kStatMapsmeGuides,
+                         kStatPlacement: data.isLargeToponim ? kStatPlacePageToponims : kStatPlacePageSightSeeing,
+                         kStatItem: @(index),
+                         kStatDestination: kStatCatalogue
+                         }];
+  NSURL *url = [NSURL URLWithString:data.catalogPromo.promoItems[index].catalogUrl];
+  NSURL *patchedUrl = [[MWMBookmarksManager sharedManager] injectCatalogUTMContent:url content:MWMUTMContentView];
+  [self openCatalogForURL:patchedUrl];
+}
+
+- (void)openCatalogMoreItems:(PlacePageData *)data {
+  [self openCatalogForURL:data.catalogPromo.moreUrl];
+  [Statistics logEvent:kStatPlacepageSponsoredMoreSelected
+        withParameters:@{
+                         kStatProvider: kStatMapsmeGuides,
+                         kStatPlacement: data.isLargeToponim ? kStatPlacePageToponims : kStatPlacePageSightSeeing,
+                         }];
+}
+
 #pragma mark - AvailableArea / PlacePageArea

 - (void)updateAvailableArea:(CGRect)frame
@ -786,7 +1120,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:

 #pragma mark - MWMFeatureHolder

- (FeatureID const &)featureId { return [self.data featureId]; }
+- (FeatureID const &)featureId { return GetFramework().GetCurrentPlacePageInfo().GetID(); }
 #pragma mark - MWMBookingInfoHolder

 - (std::vector<booking::HotelFacility> const &)hotelFacilities { return self.data.facilities; }
@ -796,17 +1130,41 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:

 - (MapViewController *)ownerViewController { return [MapViewController sharedController]; }

- (void)saveUgcWithModel:(MWMUGCReviewModel *)model language:(NSString *)language resultHandler:(void (^)(BOOL))resultHandler
-{
-  auto data = self.data;
-  if (!data)
+- (void)saveUgcWithModel:(MWMUGCReviewModel *)model
+                language:(NSString *)language
+           resultHandler:(void (^)(BOOL))resultHandler {
+  using namespace ugc;
+  auto appInfo = AppInfo.sharedInfo;
+  auto const locale =
+      static_cast<uint8_t>(StringUtf8Multilang::GetLangIndex(appInfo.twoLetterLanguageId.UTF8String));
+  std::vector<uint8_t> keyboardLanguages;
+  // TODO: Set the list of used keyboard languages (not only the recent one).
+  auto twoLetterInputLanguage = languages::Normalize(language.UTF8String);
+  keyboardLanguages.emplace_back(StringUtf8Multilang::GetLangIndex(twoLetterInputLanguage));
+
+  KeyboardText t{model.text.UTF8String, locale, keyboardLanguages};
+  Ratings r;
+  for (MWMUGCRatingStars * star in model.ratings)
+    r.emplace_back(star.title.UTF8String, star.value);
+
+  UGCUpdate update{r, t, std::chrono::system_clock::now()};
+
+  place_page::Info const & info = GetFramework().GetCurrentPlacePageInfo();
+  GetFramework().GetUGCApi()->SetUGCUpdate(info.GetID(), update,
+  [resultHandler, info](ugc::Storage::SettingResult const result)
  {
-    NSAssert(false, @"");
-    resultHandler(NO);
-    return;
-  }
-  
-  [data setUGCUpdateFrom:model language:language resultHandler:resultHandler];
+    if (result != ugc::Storage::SettingResult::Success)
+    {
+      resultHandler(NO);
+      return;
+    }
+
+    resultHandler(YES);
+    GetFramework().UpdatePlacePageInfoForCurrentSelection();
+
+    utils::RegisterEyeEventIfPossible(eye::MapObject::Event::Type::UgcSaved,
+                                      GetFramework().GetCurrentPosition(), info);
+  });
 }

 #pragma mark - MWMPlacePagePromoProtocol
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.h
@ -1,10 +1,42 @@
-#import "MWMRatingSummaryViewValueType.h"
 #import "MWMUGCReviewSource.h"
+#import <CoreApi/UgcSummaryRatingType.h>
+
+@class PlacePageData;

@interface MWMPlacePageManagerHelper : NSObject

 + (void)updateAvailableArea:(CGRect)frame;
-+ (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromSource:(MWMUGCReviewSource)source;
+ (void)showUGCAddReview:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source;
+ (void)showUGCAddReview:(PlacePageData *)data
+                  rating:(UgcSummaryRatingType)value
+              fromSource:(MWMUGCReviewSource)source;
 + (void)searchSimilar;
+ (void)editPlace;
+ (void)addBusiness;
+ (void)addPlace:(CLLocationCoordinate2D)coordinate;
+ (void)orderTaxi:(PlacePageData *)data;
+ (void)openLocalAdsURL:(PlacePageData *)data;
+ (void)openWebsite:(PlacePageData *)data;
+ (void)call:(PlacePageData *)data;
+ (void)showAllFacilities:(PlacePageData *)data;
+ (void)showPlaceDescription:(NSString *)htmlString;
+ (void)openMoreUrl:(PlacePageData *)data;
+ (void)openReviewUrl:(PlacePageData *)data;
+ (void)openDescriptionUrl:(PlacePageData *)data;
+ (void)openCatalogSingleItem:(PlacePageData *)data atIndex:(NSInteger)index;
+ (void)openCatalogMoreItems:(PlacePageData *)data;
+ (void)addBookmark:(PlacePageData *)data;
+ (void)removeBookmark:(PlacePageData *)data;
+ (void)editBookmark;
+ (void)openPartner:(PlacePageData *)data;
+ (void)book:(PlacePageData *)data;
+ (void)share:(PlacePageData *)data;
+ (void)routeFrom:(PlacePageData *)data;
+ (void)routeTo:(PlacePageData *)data;
+ (void)routeAddStop:(PlacePageData *)data;
+ (void)routeRemoveStop:(PlacePageData *)data;
+ (void)avoidDirty;
+ (void)avoidFerry;
+ (void)avoidToll;

@end
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm
@ -11,8 +11,36 @@
@interface MWMPlacePageManager ()

 - (void)updateAvailableArea:(CGRect)frame;
- (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromPreview:(BOOL)fromPreview;
+- (void)showUGCAddReview:(UgcSummaryRatingType)value fromPreview:(BOOL)fromPreview;
+- (void)showUGCAddReview:(PlacePageData *)data rating:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source;
 - (void)searchSimilar;
+- (void)editPlace;
+- (void)addBusiness;
+- (void)addPlace:(CLLocationCoordinate2D)coordinate;
+- (void)orderTaxi:(PlacePageData *)data;
+- (void)openLocalAdsURL:(PlacePageData *)data;
+- (void)openWebsite:(PlacePageData *)data;
+- (void)call:(PlacePageData *)data;
+- (void)showAllFacilities:(PlacePageData *)data;
+- (void)showPlaceDescription:(NSString *)htmlString;
+- (void)openMoreUrl:(PlacePageData *)data;
+- (void)openReviewUrl:(PlacePageData *)data;
+- (void)openDescriptionUrl:(PlacePageData *)data;
+- (void)openCatalogSingleItem:(PlacePageData *)data atIndex:(NSInteger)index;
+- (void)openCatalogMoreItems:(PlacePageData *)data;
+- (void)addBookmark:(PlacePageData *)data;
+- (void)removeBookmark:(PlacePageData *)data;
+- (void)editBookmark;
+- (void)openPartner:(PlacePageData *)data;
+- (void)book:(PlacePageData *)data;
+- (void)share:(PlacePageData *)data;
+- (void)routeFrom:(PlacePageData *)data;
+- (void)routeTo:(PlacePageData *)data;
+- (void)routeAddStop:(PlacePageData *)data;
+- (void)routeRemoveStop:(PlacePageData *)data;
+- (void)avoidDirty;
+- (void)avoidFerry;
+- (void)avoidToll;

@end

@ -23,15 +51,127 @@
  [[MWMMapViewControlsManager manager].placePageManager updateAvailableArea:frame];
 }

-+ (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromSource:(MWMUGCReviewSource)source
+ (void)showUGCAddReview:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source
 {
  [[MWMMapViewControlsManager manager].placePageManager showUGCAddReview:value
                                                             fromSource:source];
 }

+ (void)showUGCAddReview:(PlacePageData *)data rating:(UgcSummaryRatingType)value fromSource:(MWMUGCReviewSource)source {
+  [[MWMMapViewControlsManager manager].placePageManager showUGCAddReview:data rating:value fromSource:source];
+}
+
 + (void)searchSimilar
 {
  [[MWMMapViewControlsManager manager].placePageManager searchSimilar];
 }

+ (void)editPlace {
+  [[MWMMapViewControlsManager manager].placePageManager editPlace];
+}
+
+ (void)addBusiness {
+  [[MWMMapViewControlsManager manager].placePageManager addBusiness];
+}
+
+ (void)addPlace:(CLLocationCoordinate2D)coordinate {
+  [[MWMMapViewControlsManager manager].placePageManager addPlace:coordinate];
+}
+
+ (void)orderTaxi:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager orderTaxi:data];
+}
+
+ (void)openLocalAdsURL:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openLocalAdsURL:data];
+}
+
+ (void)openWebsite:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openWebsite:data];
+}
+
+ (void)call:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager call:data];
+}
+
+ (void)showAllFacilities:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager showAllFacilities:data];
+}
+
+ (void)showPlaceDescription:(NSString *)htmlString {
+  [[MWMMapViewControlsManager manager].placePageManager showPlaceDescription:htmlString];
+}
+
+ (void)openMoreUrl:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openMoreUrl:data];
+}
+
+ (void)openReviewUrl:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openReviewUrl:data];
+}
+
+ (void)openDescriptionUrl:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openDescriptionUrl:data];
+}
+
+ (void)openCatalogSingleItem:(PlacePageData *)data atIndex:(NSInteger)index {
+  [[MWMMapViewControlsManager manager].placePageManager openCatalogSingleItem:data atIndex:index];
+}
+
+ (void)openCatalogMoreItems:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openCatalogMoreItems:data];
+}
+
+ (void)addBookmark:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager addBookmark:data];
+}
+
+ (void)removeBookmark:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager removeBookmark:data];
+}
+
+ (void)editBookmark {
+  [[MWMMapViewControlsManager manager].placePageManager editBookmark];
+}
+
+ (void)openPartner:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager openPartner:data];
+}
+
+ (void)book:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager book:data];
+}
+
+ (void)share:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager share:data];
+}
+
+ (void)routeFrom:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager routeFrom:data];
+}
+
+ (void)routeTo:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager routeTo:data];
+}
+
+ (void)routeAddStop:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager routeAddStop:data];
+}
+
+ (void)routeRemoveStop:(PlacePageData *)data {
+  [[MWMMapViewControlsManager manager].placePageManager routeRemoveStop:data];
+}
+
+ (void)avoidDirty {
+  [[MWMMapViewControlsManager manager].placePageManager avoidDirty];
+}
+
+ (void)avoidFerry {
+  [[MWMMapViewControlsManager manager].placePageManager avoidFerry];
+}
+
+ (void)avoidToll {
+  [[MWMMapViewControlsManager manager].placePageManager avoidToll];
+}
+
@end
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h
@ -1,6 +1,5 @@
 #import "MWMMapViewControlsManager.h"
 #import "MWMPlacePageButtonsProtocol.h"
-#include "geometry/point2d.hpp"

@class MWMViewController;

@ -43,7 +42,6 @@ struct HotelFacility;

@protocol MWMBookingInfoHolder<NSObject>

- (std::vector<booking::HotelFacility> const &)hotelFacilities;
 - (NSString *)hotelName;

@end
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@ -3005,14 +3005,14 @@
                                </userDefinedRuntimeAttributes>
                            </view>
                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="iB6-kj-Bi1">
-                                <rect key="frame" x="16" y="17" width="343" height="183"/>
+                                <rect key="frame" x="16" y="1" width="343" height="199"/>
                                <subviews>
                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5nz-eA-gNS" customClass="ExpandableLabel" customModule="maps_me" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="343" height="139"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="343" height="155"/>
                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                    </view>
                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wB7-XJ-Nck">
-                                        <rect key="frame" x="0.0" y="139" width="343" height="44"/>
+                                        <rect key="frame" x="0.0" y="155" width="343" height="44"/>
                                        <subviews>
                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XR5-Np-W07">
                                                <rect key="frame" x="0.0" y="0.0" width="343" height="44"/>
@ -3062,7 +3062,7 @@
                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                        <constraints>
                            <constraint firstAttribute="trailing" secondItem="Ygp-O9-RnI" secondAttribute="trailing" id="6G3-el-OLU"/>
-                            <constraint firstItem="iB6-kj-Bi1" firstAttribute="top" secondItem="G5y-H6-EfE" secondAttribute="bottom" constant="16" id="Afw-Mq-NV9"/>
+                            <constraint firstItem="iB6-kj-Bi1" firstAttribute="top" secondItem="G5y-H6-EfE" secondAttribute="bottom" id="Afw-Mq-NV9"/>
                            <constraint firstAttribute="bottom" secondItem="Ygp-O9-RnI" secondAttribute="bottom" id="FWu-Cg-vld"/>
                            <constraint firstItem="Ygp-O9-RnI" firstAttribute="leading" secondItem="bRD-Uv-Uak" secondAttribute="leading" id="OVz-qv-hfp"/>
                            <constraint firstAttribute="bottom" secondItem="iB6-kj-Bi1" secondAttribute="bottom" id="QQY-yn-M6D"/>
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
@ -20,7 +20,7 @@ typedef NS_ENUM(NSInteger, MWMActionBarButtonType) {
 #ifdef __cplusplus
 extern "C" {
 #endif
-NSString * titleForButton(MWMActionBarButtonType type, int partnerIndex, BOOL isSelected);
+NSString * titleForButton(MWMActionBarButtonType type, NSInteger partnerIndex, BOOL isSelected);
 #ifdef __cplusplus
 }
 #endif
@ -40,12 +40,12 @@ NS_SWIFT_NAME(ActionBarButton)

 + (MWMActionBarButton *)buttonWithDelegate:(id<MWMActionBarButtonDelegate>)delegate
                                buttonType:(MWMActionBarButtonType)type
-                              partnerIndex:(int)partnerIndex
+                              partnerIndex:(NSInteger)partnerIndex
                                isSelected:(BOOL)isSelected
                                isDisabled:(BOOL)isDisabled;

 - (MWMActionBarButtonType)type;
 - (MWMCircularProgress *)mapDownloadProgress;
- (int)partnerIndex;
+- (NSInteger)partnerIndex;

@end
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
@ -2,15 +2,15 @@
 #import "MWMButton.h"
 #import "MWMCircularProgress+Swift.h"

-NSString * titleForPartner(int partnerIndex)
+NSString * titleForPartner(NSInteger partnerIndex)
 {
-  NSString * str = [NSString stringWithFormat:@"sponsored_partner%d_action", partnerIndex];
+  NSString * str = [NSString stringWithFormat:@"sponsored_partner%ld_action", (long)partnerIndex];
  NSString * localizedStr = L(str);
  NSCAssert(![str isEqualToString:localizedStr], @"Localization is absent.");
  return localizedStr;
 }

-NSString * titleForButton(MWMActionBarButtonType type, int partnerIndex, BOOL isSelected)
+NSString * titleForButton(MWMActionBarButtonType type, NSInteger partnerIndex, BOOL isSelected)
 {
  switch (type)
  {
@ -33,29 +33,29 @@ NSString * titleForButton(MWMActionBarButtonType type, int partnerIndex, BOOL is
  }
 }

-NSString * imageNameForPartner(int partnerIndex)
+NSString * imageNameForPartner(NSInteger partnerIndex)
 {
-  return [NSString stringWithFormat:@"ic_28px_logo_partner%d", partnerIndex];
+  return [NSString stringWithFormat:@"ic_28px_logo_partner%ld", (long)partnerIndex];
 }

-UIImage * imageForPartner(int partnerIndex)
+UIImage * imageForPartner(NSInteger partnerIndex)
 {
  UIImage * img = [UIImage imageNamed:imageNameForPartner(partnerIndex)];
  NSCAssert(img != nil, @"Partner image is absent.");
  return img;
 }

-UIColor * textColorForPartner(int partnerIndex)
+UIColor * textColorForPartner(NSInteger partnerIndex)
 {
-  NSString * textColor = [NSString stringWithFormat:@"partner%dTextColor", partnerIndex];
+  NSString * textColor = [NSString stringWithFormat:@"partner%ldTextColor", (long)partnerIndex];
  UIColor * color = [UIColor colorWithName:textColor];
  NSCAssert(color != nil, @"Partner text color is absent.");
  return color;
 }

-UIColor * backgroundColorForPartner(int partnerIndex)
+UIColor * backgroundColorForPartner(NSInteger partnerIndex)
 {
-  NSString * colorName = [NSString stringWithFormat:@"partner%dBackground", partnerIndex];
+  NSString * colorName = [NSString stringWithFormat:@"partner%ldBackground", (long)partnerIndex];
  UIColor * color = [UIColor colorWithName:colorName];
  NSCAssert(color != nil, @"Partner background color is absent.");
  return color;
@ -65,7 +65,7 @@ UIColor * backgroundColorForPartner(int partnerIndex)

@property(nonatomic) MWMActionBarButtonType type;
@property(nonatomic) MWMCircularProgress * mapDownloadProgress;
-@property(nonatomic) int partnerIndex;
+@property(nonatomic) NSInteger partnerIndex;
@property(weak, nonatomic) IBOutlet MWMButton * button;
@property(weak, nonatomic) IBOutlet UILabel * label;
@property(weak, nonatomic) IBOutlet UIView * extraBackground;
@ -176,7 +176,7 @@ UIColor * backgroundColorForPartner(int partnerIndex)

 + (MWMActionBarButton *)buttonWithDelegate:(id<MWMActionBarButtonDelegate>)delegate
                                buttonType:(MWMActionBarButtonType)type
-                              partnerIndex:(int)partnerIndex
+                              partnerIndex:(NSInteger)partnerIndex
                                isSelected:(BOOL)isSelected
                                isDisabled:(BOOL)isDisabled
 {
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.xib
@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMActionBarButton"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMActionBarButton" propertyAccessControl="all">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMActionBarButton">
            <rect key="frame" x="0.0" y="0.0" width="80" height="48"/>
            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
            <subviews>
@ -21,9 +19,6 @@
                </view>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W07-Hz-J60" customClass="MWMButton">
                    <rect key="frame" x="0.0" y="2" width="80" height="33"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="33" id="pcB-ET-28J"/>
-                    </constraints>
                    <userDefinedRuntimeAttributes>
                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
                    </userDefinedRuntimeAttributes>
@ -66,6 +61,7 @@
                <outlet property="extraBackground" destination="R50-Tj-X0W" id="c90-1d-BSU"/>
                <outlet property="label" destination="rrI-0A-w3s" id="LMD-pz-agZ"/>
            </connections>
+            <point key="canvasLocation" x="139" y="124"/>
        </view>
    </objects>
 </document>
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.h
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.h
@ -1,15 +1,10 @@
 #import "MWMTableViewController.h"

-#include <vector>
-
-namespace booking
-{
-struct HotelFacility;
-}
+@class HotelFacility;

@interface MWMFacilitiesController : MWMTableViewController

- (void)setHotelName:(NSString *)name;
- (void)setFacilities:(std::vector<booking::HotelFacility> const &)facilities;
+@property(nonatomic, copy) NSString *name;
+@property(nonatomic, copy) NSArray<HotelFacility *> *facilities;

@end
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.m
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.m
@ -0,0 +1,29 @@
+#import "MWMFacilitiesController.h"
+#import "SwiftBridge.h"
+
+@implementation MWMFacilitiesController
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+
+  self.tableView.estimatedRowHeight = 44;
+  self.tableView.rowHeight = UITableViewAutomaticDimension;
+  [self.tableView registerWithCellClass:[MWMPPFacilityCell class]];
+
+  self.title = self.name;
+}
+
+#pragma mark - TableView
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+  return self.facilities.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+  Class cls = [MWMPPFacilityCell class];
+  MWMPPFacilityCell *c = (MWMPPFacilityCell *)[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
+  [c configWith:self.facilities[indexPath.row].name];
+  return c;
+}
+
+@end
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Controllers/MWMFacilitiesController.mm
@ -1,38 +0,0 @@
-#import "MWMFacilitiesController.h"
-#import "SwiftBridge.h"
-
-#include "partners_api/booking_api.hpp"
-
-@implementation MWMFacilitiesController
-{
-  std::vector<booking::HotelFacility> m_dataSource;
-}
-
- (void)viewDidLoad
-{
-  [super viewDidLoad];
-  self.tableView.estimatedRowHeight = 44;
-  self.tableView.rowHeight = UITableViewAutomaticDimension;
-  [self.tableView registerWithCellClass:[MWMPPFacilityCell class]];
-}
-
- (void)setHotelName:(NSString *)name { self.title = name; }
-
- (void)setFacilities:(std::vector<booking::HotelFacility> const &)facilities { m_dataSource = facilities; }
-
-#pragma mark - TableView
-
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-  return m_dataSource.size();
-}
-
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  Class cls = [MWMPPFacilityCell class];
-  auto c = static_cast<MWMPPFacilityCell *>([tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
-  [c configWith:@(m_dataSource[indexPath.row].m_name.c_str())];
-  return c;
-}
-
-@end
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/TaxiCell/PlacePageTaxiCell.swift
@ -47,6 +47,6 @@ final class PlacePageTaxiCell: MWMTableViewCell {
  }

  @IBAction func orderAction() {
-    delegate.orderTaxi(type)
+//    delegate.orderTaxi(type)
  }
 }
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCReviewModel.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCReviewModel.swift
@ -1,13 +1,13 @@
@objc(MWMUGCReviewModel)
 final class UGCReviewModel: NSObject {
-  let reviewValue: MWMRatingSummaryViewValueType
+  let reviewValue: UgcSummaryRatingType

  @objc let ratings: [UGCRatingStars]
  @objc var text: String

  let title: String

-  @objc init(reviewValue: MWMRatingSummaryViewValueType, ratings: [UGCRatingStars], title: String, text: String) {
+  @objc init(reviewValue: UgcSummaryRatingType, ratings: [UGCRatingStars], title: String, text: String) {
    self.reviewValue = reviewValue
    self.ratings = ratings
    self.title = title
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReviewCell.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReviewCell.swift
@ -83,7 +83,7 @@ final class UGCAddReviewCell: MWMTableViewCell {
    }
  }

-  @objc var onRateTap: ((MWMRatingSummaryViewValueType) -> Void)!
+  @objc var onRateTap: ((UgcSummaryRatingType) -> Void)!

  @IBAction private func rate(_ button: UIButton) {
    switch button {
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCRating.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCRating.swift
@ -1,9 +1,9 @@
@objc(MWMUGCRatingValueType)
 class UGCRatingValueType: NSObject {
  let value: String
-  let type: MWMRatingSummaryViewValueType
+  let type: UgcSummaryRatingType

-  @objc init(value: String, type: MWMRatingSummaryViewValueType) {
+  @objc init(value: String, type: UgcSummaryRatingType) {
    self.value = value
    self.type = type
    super.init()
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm
@ -558,7 +558,7 @@ std::map<MetainfoRows, Class> const kMetaInfoCells = {
      Class cls = [MWMUGCAddReviewCell class];
      auto c = static_cast<MWMUGCAddReviewCell *>(
          [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
-      c.onRateTap = ^(MWMRatingSummaryViewValueType value) {
+      c.onRateTap = ^(UgcSummaryRatingType value) {
        [delegate showUGCAddReview:value fromSource:MWMUGCReviewSourcePlacePage];
      };
      return c;
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
@ -265,7 +265,7 @@ std::array<Class, 9> const kPreviewCells = {{[_MWMPPPTitle class],
                          discount:0
                         smartDeal:NO
                       onAddReview:^{
-                         [MWMPlacePageManagerHelper showUGCAddReview:MWMRatingSummaryViewValueTypeNoValue
+                         [MWMPlacePageManagerHelper showUGCAddReview:UgcSummaryRatingTypeNone
                                                         fromSource:MWMUGCReviewSourcePlacePagePreview];
                       }];
    }
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPReview.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPReview.swift
@ -66,7 +66,7 @@ final class PPPReview: MWMTableViewCell {
    }
    pricingLabel.isHidden = true
    reviewsLabel.isHidden = false
-    if rating.type == .noValue {
+    if rating.type == .none {
      if isReviewedByUser {
        ratingSummaryView.noValueImage = #imageLiteral(resourceName: "ic_12px_radio_on")
        ratingSummaryView.noValueColor = UIColor.linkBlue()
--- a/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift
@ -80,8 +80,7 @@ class PlacePagePreviewViewController: UIViewController {
    if let summaryRating = ugcData.summaryRating {
      ratingSummaryView.defaultConfig()
      ratingSummaryView.value = summaryRating.ratingString
-      let r = summaryRating.ratingType.rawValue
-      ratingSummaryView.type = MWMRatingSummaryViewValueType(rawValue: UInt(r))!
+      ratingSummaryView.type = summaryRating.ratingType
      reviewsLabel.text = String(format:L("placepage_summary_rating_description"), ugcData.ratingsCount)
    } else {
      if ugcData.isUpdateEmpty {
@ -103,8 +102,8 @@ class PlacePagePreviewViewController: UIViewController {
    ugcContainerView.isHidden = false
    ratingSummaryView.defaultConfig()
    ratingSummaryView.value = NSNumber(value: bookingData.score).stringValue
-    let rawRating = UInt(bookingData.score / 2) + 1
-    ratingSummaryView.type = MWMRatingSummaryViewValueType(rawValue: rawRating) ?? .noValue
+    let rawRating = Int(bookingData.score / 2) + 1
+    ratingSummaryView.type = UgcSummaryRatingType(rawValue: rawRating) ?? .none
    guard let rooms = rooms else { return }
    priceLabel.text = String(coreFormat: L("place_page_starting_from"), arguments: [rooms.minPrice])
    priceLabel.isHidden = false
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@ -122,7 +122,7 @@ class PlacePageScrollView: UIScrollView {
  lazy var actionBarViewController: ActionBarViewController = {
    let vc = storyboard!.instantiateViewController(ofType: ActionBarViewController.self)
    vc.placePageData = placePageData
-//    vc.delegate = self
+    vc.delegate = self
    return vc
  } ()

@ -257,7 +257,8 @@ class PlacePageScrollView: UIScrollView {
    let bgView = UIView()
    bgView.backgroundColor = UIColor.white()
    stackView.insertSubview(bgView, at: 0)
-    bgView.alignToSuperview()    
+    bgView.alignToSuperview()
+    scrollView.decelerationRate = .fast
  }

  override func viewDidLayoutSubviews() {
@ -267,10 +268,10 @@ class PlacePageScrollView: UIScrollView {

  override func viewDidAppear(_ animated: Bool) {
    super.viewDidAppear(animated)
-//    let previewFrame = scrollView.convert(previewViewController.view.bounds, from: previewViewController.view)
-//    UIView.animate(withDuration: kDefaultAnimationDuration) {
-//      self.scrollView.contentOffset = CGPoint(x: 0, y: previewFrame.maxY - self.scrollView.height)
-//    }
+    let previewFrame = self.scrollView.convert(self.previewViewController.view.bounds, from: self.previewViewController.view)
+    UIView.animate(withDuration: kDefaultAnimationDuration) {
+      self.scrollView.contentOffset = CGPoint(x: 0, y: previewFrame.maxY - self.scrollView.height)
+    }
  }

  // MARK: private
@ -284,25 +285,21 @@ class PlacePageScrollView: UIScrollView {

 extension PlacePageViewController: PlacePagePreviewViewControllerDelegate {
  func previewDidPressAddReview() {
-
+    MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: .none, from: .placePagePreview)
  }

  func previewDidPressSimilarHotels() {
-
+    MWMPlacePageManagerHelper.searchSimilar()
  }
 }

 extension PlacePageViewController: PlacePageInfoViewControllerDelegate {
  func didPressCall() {
-    guard let phoneUrl = placePageData.infoData.phoneUrl,
-      UIApplication.shared.canOpenURL(phoneUrl) else { return }
-    UIApplication.shared.open(phoneUrl, options: [:])
+    MWMPlacePageManagerHelper.call(placePageData)
  }

  func didPressWebsite() {
-    guard let website = placePageData.infoData.website,
-      let url = URL(string: website) else { return }
-    UIApplication.shared.open(url, options: [:])
+    MWMPlacePageManagerHelper.openWebsite(placePageData)
  }

  func didPressEmail() {
@ -310,25 +307,25 @@ extension PlacePageViewController: PlacePageInfoViewControllerDelegate {
  }

  func didPressLocalAd() {
-
+    MWMPlacePageManagerHelper.openLocalAdsURL(placePageData)
  }
 }

 extension PlacePageViewController: WikiDescriptionViewControllerDelegate {
  func didPressMore() {
-
+    MWMPlacePageManagerHelper.showPlaceDescription(placePageData.wikiDescriptionHtml)
  }
 }

 extension PlacePageViewController: TaxiViewControllerDelegate {
  func didPressOrder() {
-
+    MWMPlacePageManagerHelper.orderTaxi(placePageData)
  }
 }

 extension PlacePageViewController: AddReviewViewControllerDelegate {
  func didRate(_ rating: UgcSummaryRatingType) {
-
+    MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: rating, from: .placePage)
  }
 }

@ -340,19 +337,19 @@ extension PlacePageViewController: PlacePageReviewsViewControllerDelegate {

 extension PlacePageViewController: PlacePageButtonsViewControllerDelegate {
  func didPressHotels() {
-
+    MWMPlacePageManagerHelper.openDescriptionUrl(placePageData)
  }

  func didPressAddPlace() {
-
+    MWMPlacePageManagerHelper.addPlace(placePageData.locationCoordinate)
  }

  func didPressEditPlace() {
-
+    MWMPlacePageManagerHelper.editPlace()
  }

  func didPressAddBusiness() {
-
+    MWMPlacePageManagerHelper.addBusiness()
  }
 }

@ -364,45 +361,90 @@ extension PlacePageViewController: HotelPhotosViewControllerDelegate {

 extension PlacePageViewController: HotelDescriptionViewControllerDelegate {
  func hotelDescriptionDidPressMore() {
-
+    MWMPlacePageManagerHelper.openMoreUrl(placePageData)
  }
 }

 extension PlacePageViewController: HotelFacilitiesViewControllerDelegate {
  func facilitiesDidPressMore() {
-
+    MWMPlacePageManagerHelper.showAllFacilities(placePageData)
  }
 }

 extension PlacePageViewController: HotelReviewsViewControllerDelegate {
  func hotelReviewsDidPressMore() {
-
+    MWMPlacePageManagerHelper.openReviewUrl(placePageData)
  }
 }

 extension PlacePageViewController: CatalogSingleItemViewControllerDelegate {
  func catalogPromoItemDidPressView() {
-
+    MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
  }

  func catalogPromoItemDidPressMore() {
-
+    MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: 0)
  }
 }

 extension PlacePageViewController: CatalogGalleryViewControllerDelegate {
  func promoGalleryDidPressMore() {
-    
+    MWMPlacePageManagerHelper.openCatalogMoreItems(placePageData)
  }

  func promoGalleryDidSelectItemAtIndex(_ index: Int) {
-
+    MWMPlacePageManagerHelper.openCatalogSingleItem(placePageData, at: index)
  }
 }

 extension PlacePageViewController: PlacePageBookmarkViewControllerDelegate {
  func bookmarkDidPressEdit() {
+    MWMPlacePageManagerHelper.editBookmark()
+  }
+}

+extension PlacePageViewController: ActionBarViewControllerDelegate {
+  func actionBarDidPressButton(_ type: ActionBarButtonType) {
+    switch type {
+    case .booking:
+      MWMPlacePageManagerHelper.book(placePageData)
+    case .bookingSearch:
+      MWMPlacePageManagerHelper.searchSimilar()
+    case .bookmark:
+      if placePageData.bookmarkData != nil {
+        MWMPlacePageManagerHelper.removeBookmark(placePageData)
+      } else {
+        MWMPlacePageManagerHelper.addBookmark(placePageData)
+      }
+    case .call:
+      MWMPlacePageManagerHelper.call(placePageData)
+    case .download:
+      fatalError()
+    case .opentable:
+      fatalError("Opentable is not supported and will be deleted")
+    case .partner:
+      MWMPlacePageManagerHelper.openPartner(placePageData)
+    case .routeAddStop:
+      MWMPlacePageManagerHelper.routeAddStop(placePageData)
+    case .routeFrom:
+      MWMPlacePageManagerHelper.route(from: placePageData)
+    case .routeRemoveStop:
+      MWMPlacePageManagerHelper.routeRemoveStop(placePageData)
+    case .routeTo:
+      MWMPlacePageManagerHelper.route(to: placePageData)
+    case .share:
+      MWMPlacePageManagerHelper.share(placePageData)
+    case .avoidToll:
+      MWMPlacePageManagerHelper.avoidToll()
+    case .avoidDirty:
+      MWMPlacePageManagerHelper.avoidDirty()
+    case .avoidFerry:
+      MWMPlacePageManagerHelper.avoidFerry()
+    case .more:
+      fatalError("More button should've been handled in ActionBarViewContoller")
+    @unknown default:
+      fatalError()
+    }
  }
 }

@ -430,3 +472,40 @@ extension PlacePageViewController: MWMLocationObserver {
    
  }
 }
+
+extension UgcData: MWMReviewsViewModelProtocol {
+  public func numberOfReviews() -> Int {
+    reviews.count
+  }
+
+  public func review(with index: Int) -> MWMReviewProtocol {
+    UgcReviewAdapter(reviews[index])
+  }
+
+  public func isExpanded(_ review: MWMReviewProtocol) -> Bool {
+    false
+  }
+
+  public func markExpanded(_ review: MWMReviewProtocol) {
+
+  }
+}
+
+class UgcReviewAdapter: MWMReviewProtocol {
+  var date: String {
+    let formatter = DateFormatter()
+    formatter.dateStyle = .long
+    formatter.timeStyle = .none
+    return formatter.string(from: ugcReview.date)
+  }
+
+  var text: String {
+    ugcReview.text
+  }
+
+  private let ugcReview: UgcReview
+  init(_ review: UgcReview) {
+    ugcReview = review
+  }
+}
+
--- a/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift
+++ b/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift
@ -38,8 +38,7 @@ class RatingSummaryViewController: UIViewController {
    guard let ugcData = ugcData else { return }

    ratingSummaryView.value = ugcData.summaryRating!.ratingString
-    let r = ugcData.summaryRating!.ratingType.rawValue
-    ratingSummaryView.type = MWMRatingSummaryViewValueType(rawValue: UInt(r))!
+    ratingSummaryView.type = ugcData.summaryRating!.ratingType

    countLabel.text = String(format:L("placepage_summary_rating_description"), ugcData.ratingsCount)

--- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.h
+++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.h
@ -24,8 +24,6 @@ enum class Price {
@property (nonatomic) NSDate * checkInDate;
@property (nonatomic) NSDate * checkOutDate;

- (instancetype)initWithPlacePageData:(MWMPlacePageData *)data;
-
 - (std::shared_ptr<search::hotels_filter::Rule>)rules;
 - (booking::filter::Params)availabilityParams;

--- a/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMHotelParams.mm
@ -1,27 +1,30 @@
 #import "MWMHotelParams.h"

+#include <CoreApi/Framework.h>
+
 static uint8_t kAdultsCount = 2;
 static int8_t kAgeOfChild = 5;

@implementation MWMHotelParams

- (instancetype)initWithPlacePageData:(MWMPlacePageData *)data
+- (instancetype)init
 {
  self = [super init];
  if (self)
  {
    _types.insert(ftypes::IsHotelChecker::Type::Hotel);
-    CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.m_lat, data.latLon.m_lon));
+    auto const & data = GetFramework().GetCurrentPlacePageInfo();
+    CHECK(data.GetHotelType(), ("Incorrect hotel type at coordinate:", data.GetLatLon().m_lat, data.GetLatLon().m_lon));
    
-    if (data.isBooking)
+    if (data.GetSponsoredType() == place_page::SponsoredType::Booking)
    {
-      if (auto const price = data.hotelRawApproximatePricing)
+      if (auto const price = data.GetRawApproximatePricing())
      {
        CHECK_LESS_OR_EQUAL(*price, base::Underlying(Price::Three), ());
        _price.insert(static_cast<Price>(*price));
      }
      
-      self.rating = place_page::rating::GetFilterRating(data.ratingRawValue);
+      self.rating = place_page::rating::GetFilterRating(data.GetRatingRawValue());
    }
  }
  
--- a/iphone/Maps/UI/Storyboard/Main.storyboard
+++ b/iphone/Maps/UI/Storyboard/Main.storyboard
@ -129,31 +129,12 @@
                        <segue destination="lFr-lA-JTW" kind="show" identifier="PP2BookmarkEditing" id="0A8-4b-0A2"/>
                        <segue destination="Psz-BY-Fy4" kind="presentation" identifier="PP2BookmarkEditingIPAD" modalPresentationStyle="formSheet" id="k6v-a7-5DO"/>
                        <segue destination="DdR-kk-MnB" kind="custom" identifier="Map2Settings" customClass="MWMSegue" id="wtl-on-KxQ"/>
-                        <segue destination="A8t-Zn-AGP" kind="custom" identifier="Map2FacilitiesSegue" customClass="MWMSegue" id="BOb-Wh-k7j"/>
                    </connections>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="cKg-Q7-bFd" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
            <point key="canvasLocation" x="1132.5" y="443.66197183098592"/>
        </scene>
-        <!--Facilities Controller-->
-        <scene sceneID="2px-7m-UAf">
-            <objects>
-                <tableViewController id="A8t-Zn-AGP" customClass="MWMFacilitiesController" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="kNh-ar-yQv">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                        <connections>
-                            <outlet property="dataSource" destination="A8t-Zn-AGP" id="vIb-hx-q5j"/>
-                            <outlet property="delegate" destination="A8t-Zn-AGP" id="ExI-mO-xCG"/>
-                        </connections>
-                    </tableView>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="xFK-gh-uhg" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2704" y="-452"/>
-        </scene>
        <!--Navigation Controller-->
        <scene sceneID="lCi-qJ-2rn">
            <objects>