[ios] fix swift 5.9 compile errors

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>

iphone/CoreApi/CoreApi/Formatting/DateTimeFormatter.swift

@@ -1,4 +1,5 @@
 import Foundation
+import CoreLocation.CLLocation
 
 @objcMembers
 public final class DateTimeFormatter: NSObject {

iphone/CoreApi/CoreApi/PlacePageData/Common/ProductsConfiguration.swift

@@ -1,4 +1,5 @@
 import Foundation
+import UIKit.UIGeometry
 
 @objcMembers
 public final class Product: NSObject {

iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift

@@ -152,7 +152,7 @@ final class ActionBarViewController: UIViewController {
                                         preferredStyle: .actionSheet)
     for button in additionalButtons {
       let (selected, enabled) = buttonState(button)
-      let action = UIAlertAction(title: titleForButton(button, selected),
+      let action = UIAlertAction(title: ActionBarButton.title(for: button, isSelected: selected),
                                  style: .default,
                                  handler: { [weak self] _ in
                                   guard let self = self else { return }

iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h

@@ -24,14 +24,6 @@ typedef NS_ENUM(NSInteger, MWMBookmarksButtonState) {
 
 NS_ASSUME_NONNULL_BEGIN
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-NSString * titleForButton(MWMActionBarButtonType type, BOOL isSelected);
-#ifdef __cplusplus
-}
-#endif
-
 @class MWMActionBarButton;
 @class MWMCircularProgress;
 
@@ -52,6 +44,7 @@ NS_SWIFT_NAME(ActionBarButton)
                                 buttonType:(MWMActionBarButtonType)type
                                 isSelected:(BOOL)isSelected
                                 isEnabled:(BOOL)isEnabled;
++ (NSString *)titleForButton:(MWMActionBarButtonType)type isSelected:(BOOL)isSelected;
 
 - (void)setBookmarkButtonState:(MWMBookmarksButtonState)state;
 

iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m

@@ -5,39 +5,6 @@
 
 static NSString * const kUDDidHighlightRouteToButton = @"kUDDidHighlightPoint2PointButton";
 
-NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
-  switch (type) {
-    case MWMActionBarButtonTypeDownload:
-      return L(@"download");
-    case MWMActionBarButtonTypeBooking:
-    case MWMActionBarButtonTypeOpentable:
-      return L(@"book_button");
-    case MWMActionBarButtonTypeBookingSearch:
-      return L(@"booking_search");
-    case MWMActionBarButtonTypeCall:
-      return L(@"placepage_call_button");
-    case MWMActionBarButtonTypeBookmark:
-    case MWMActionBarButtonTypeTrack:
-      return L(isSelected ? @"delete" : @"save");
-    case MWMActionBarButtonTypeRouteFrom:
-      return L(@"p2p_from_here");
-    case MWMActionBarButtonTypeRouteTo:
-      return L(@"p2p_to_here");
-    case MWMActionBarButtonTypeMore:
-      return L(@"placepage_more_button");
-    case MWMActionBarButtonTypeRouteAddStop:
-      return L(@"placepage_add_stop");
-    case MWMActionBarButtonTypeRouteRemoveStop:
-      return L(@"placepage_remove_stop");
-    case MWMActionBarButtonTypeAvoidToll:
-      return L(@"avoid_tolls");
-    case MWMActionBarButtonTypeAvoidDirty:
-      return L(@"avoid_unpaved");
-    case MWMActionBarButtonTypeAvoidFerry:
-      return L(@"avoid_ferry");
-  }
-}
-
 @interface MWMActionBarButton () <MWMCircularProgressProtocol>
 
 @property(nonatomic) MWMActionBarButtonType type;
@@ -52,7 +19,7 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
 @implementation MWMActionBarButton
 
 - (void)configButton:(BOOL)isSelected enabled:(BOOL)isEnabled {
-  self.label.text = titleForButton(self.type, isSelected);
+  self.label.text = [MWMActionBarButton titleForButton:self.type isSelected:isSelected];
   self.extraBackground.hidden = YES;
   self.button.coloring = MWMButtonColoringBlack;
   
@@ -221,4 +188,37 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
   return [self pointInside:point withEvent:event] ? self.button : nil;
 }
 
++ (NSString *)titleForButton:(MWMActionBarButtonType)type isSelected:(BOOL)isSelected {
+  switch (type) {
+    case MWMActionBarButtonTypeDownload:
+      return L(@"download");
+    case MWMActionBarButtonTypeBooking:
+    case MWMActionBarButtonTypeOpentable:
+      return L(@"book_button");
+    case MWMActionBarButtonTypeBookingSearch:
+      return L(@"booking_search");
+    case MWMActionBarButtonTypeCall:
+      return L(@"placepage_call_button");
+    case MWMActionBarButtonTypeBookmark:
+    case MWMActionBarButtonTypeTrack:
+      return L(isSelected ? @"delete" : @"save");
+    case MWMActionBarButtonTypeRouteFrom:
+      return L(@"p2p_from_here");
+    case MWMActionBarButtonTypeRouteTo:
+      return L(@"p2p_to_here");
+    case MWMActionBarButtonTypeMore:
+      return L(@"placepage_more_button");
+    case MWMActionBarButtonTypeRouteAddStop:
+      return L(@"placepage_add_stop");
+    case MWMActionBarButtonTypeRouteRemoveStop:
+      return L(@"placepage_remove_stop");
+    case MWMActionBarButtonTypeAvoidToll:
+      return L(@"avoid_tolls");
+    case MWMActionBarButtonTypeAvoidDirty:
+      return L(@"avoid_unpaved");
+    case MWMActionBarButtonTypeAvoidFerry:
+      return L(@"avoid_ferry");
+  }
+}
+
 @end