Merge pull request #3771 from igrechuhin/navigation

[ios] Added search buttons to routing.

iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm

@@ -277,9 +277,13 @@ CGFloat constexpr kTimeWidthRegular = 128;
   {
   case MWMBottomMenuStateHidden: self.minY = self.superview.height; return;
   case MWMBottomMenuStateInactive:
-  case MWMBottomMenuStateCompact:
   case MWMBottomMenuStatePlanning:
   case MWMBottomMenuStateGo: break;
+  case MWMBottomMenuStateCompact:
+    if (self.restoreState == MWMBottomMenuStateRouting && !IPAD &&
+        UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation))
+      self.mainButtonsHeight.constant = kRoutingMainButtonsHeightLandscape;
+    break;
   case MWMBottomMenuStateActive:
   {
     self.separatorHeight.constant = 1.0;

iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib

@@ -392,7 +392,7 @@
                                     <integer key="value" value="4"/>
                                 </userDefinedRuntimeAttribute>
                                 <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="current_location_unknown_stop_button"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whiteColor"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="buttonRed"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="buttonRedHighlighted"/>
                             </userDefinedRuntimeAttributes>

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h

@@ -35,6 +35,7 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState) {
 @property(weak, nonatomic, readonly) id<MWMNavigationDashboardManagerProtocol> delegate;
 @property(nonatomic) CGFloat topBound;
 @property(nonatomic) CGFloat leftBound;
+@property(nonatomic, readonly) CGFloat extraCompassBottomOffset;
 @property(nonatomic, readonly) CGFloat height;
 
 - (instancetype)init __attribute__((unavailable("init is not available")));

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm

@@ -238,4 +238,11 @@ using TInfoDisplays = NSHashTable<__kindof TInfoDisplay>;
   return _entity;
 }
 
+- (CGFloat)extraCompassBottomOffset
+{
+  if (!_navigationInfoView)
+    return 0;
+  return self.navigationInfoView.extraCompassBottomOffset;
+}
+
 @end

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.h

@@ -3,6 +3,7 @@
 @interface MWMNavigationInfoView : UIView<MWMNavigationDashboardInfoProtocol>
 
 @property(nonatomic) CGFloat leftBound;
+@property(nonatomic, readonly) CGFloat extraCompassBottomOffset;
 @property(nonatomic, readonly) CGFloat visibleHeight;
 
 - (void)addToView:(UIView *)superview;

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.mm

@@ -1,5 +1,6 @@
 #import "MWMNavigationInfoView.h"
 #import "Common.h"
+#import "MWMButton.h"
 #import "MWMLocationHelpers.h"
 #import "MWMLocationManager.h"
 #import "MWMRouter.h"
@@ -12,6 +13,44 @@ namespace
 {
 CGFloat constexpr kTurnsiPhoneWidth = 96;
 CGFloat constexpr kTurnsiPadWidth = 140;
+
+CGFloat constexpr kSearchMainButtonBottomOffsetPortrait = 174;
+CGFloat constexpr kSearchMainButtonBottomOffsetLandscape = 48;
+
+CGFloat constexpr kSearchButtonsViewHeightPortrait = 200;
+CGFloat constexpr kSearchButtonsViewWidthPortrait = 200;
+CGFloat constexpr kSearchButtonsViewHeightLandscape = 56;
+CGFloat constexpr kSearchButtonsViewWidthLandscape = 286;
+CGFloat constexpr kSearchButtonsSideSize = 44;
+
+NSTimeInterval constexpr kCollapseSearchTimeout = 5.0;
+
+enum class SearchState
+{
+  Maximized,
+  MinimizedNormal,
+  MinimizedSearch,
+  MinimizedGas,
+  MinimizedParking,
+  MinimizedFood,
+  MinimizedShop,
+  MinimizedATM
+};
+
+map<SearchState, NSString *> const kSearchStateButtonImageNames{
+    {SearchState::Maximized, @"ic_routing_search"},
+    {SearchState::MinimizedNormal, @"ic_routing_search"},
+    {SearchState::MinimizedSearch, @"ic_routing_search_off"},
+    {SearchState::MinimizedGas, @"ic_routing_fuel_off"},
+    {SearchState::MinimizedParking, @"ic_routing_parking_off"},
+    {SearchState::MinimizedFood, @"ic_routing_food_off"},
+    {SearchState::MinimizedShop, @"ic_routing_shop_off"},
+    {SearchState::MinimizedATM, @"ic_routing_atm_off"}};
+
+BOOL defaultOrientation()
+{
+  return IPAD || UIDeviceOrientationIsPortrait([UIDevice currentDevice].orientation);
+}
 }  // namespace
 
 @interface MWMNavigationInfoView ()<MWMLocationObserver>
@@ -25,6 +64,22 @@ CGFloat constexpr kTurnsiPadWidth = 140;
 @property(weak, nonatomic) IBOutlet UIImageView * secondTurnImageView;
 @property(weak, nonatomic) IBOutlet NSLayoutConstraint * turnsWidth;
 
+@property(weak, nonatomic) IBOutlet UIView * searchView;
+@property(weak, nonatomic) IBOutlet UIView * searchButtonsView;
+@property(weak, nonatomic) IBOutlet MWMButton * searchMainButton;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsViewHeight;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchButtonsViewWidth;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * searchMainButtonBottomOffset;
+@property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray * searchLandscapeConstraints;
+@property(nonatomic) IBOutletCollection(UIButton) NSArray * searchButtons;
+@property(nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray * searchButtonsSideSize;
+@property(weak, nonatomic) IBOutlet MWMButton * searchButtonGas;
+@property(weak, nonatomic) IBOutlet MWMButton * searchButtonParking;
+@property(weak, nonatomic) IBOutlet MWMButton * searchButtonFood;
+@property(weak, nonatomic) IBOutlet MWMButton * searchButtonShop;
+@property(weak, nonatomic) IBOutlet MWMButton * searchButtonATM;
+
+@property(nonatomic) SearchState searchState;
 @property(nonatomic) BOOL isVisible;
 
 @property(weak, nonatomic) MWMNavigationDashboardEntity * navigationInfo;
@@ -36,6 +91,7 @@ CGFloat constexpr kTurnsiPadWidth = 140;
 - (void)addToView:(UIView *)superview
 {
   self.isVisible = YES;
+  [self setSearchState:SearchState::MinimizedNormal animated:NO];
   if (IPAD)
   {
     self.turnsWidth.constant = kTurnsiPadWidth;
@@ -60,22 +116,51 @@ CGFloat constexpr kTurnsiPadWidth = 140;
     self.frame = self.defaultFrame;
     [self setNeedsLayout];
   }
+
   if (!self.isVisible)
     [self removeFromSuperview];
   [super layoutSubviews];
 }
 
-- (void)setIsVisible:(BOOL)isVisible
+- (CGFloat)visibleHeight { return self.streetNameView.maxY; }
+#pragma mark - Search
+
+- (IBAction)searchMainButtonTouchUpInside
 {
-  _isVisible = isVisible;
-  [self setNeedsLayout];
-  if (isVisible && [MWMRouter router].type == routing::RouterType::Pedestrian)
-    [MWMLocationManager addObserver:self];
-  else
-    [MWMLocationManager removeObserver:self];
+  switch (self.searchState)
+  {
+  case SearchState::Maximized:
+    [self setSearchState:SearchState::MinimizedSearch animated:YES];
+    break;
+  case SearchState::MinimizedNormal:
+    [self setSearchState:SearchState::Maximized animated:YES];
+    break;
+  case SearchState::MinimizedSearch:
+  case SearchState::MinimizedGas:
+  case SearchState::MinimizedParking:
+  case SearchState::MinimizedFood:
+  case SearchState::MinimizedShop:
+  case SearchState::MinimizedATM:
+    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+    break;
+  }
 }
 
-- (CGFloat)visibleHeight { return self.streetNameView.maxY; }
+- (IBAction)searchButtonTouchUpInside:(MWMButton *)sender
+{
+  if (sender == self.searchButtonGas)
+    [self setSearchState:SearchState::MinimizedGas animated:YES];
+  else if (sender == self.searchButtonParking)
+    [self setSearchState:SearchState::MinimizedParking animated:YES];
+  else if (sender == self.searchButtonFood)
+    [self setSearchState:SearchState::MinimizedFood animated:YES];
+  else if (sender == self.searchButtonShop)
+    [self setSearchState:SearchState::MinimizedShop animated:YES];
+  else if (sender == self.searchButtonATM)
+    [self setSearchState:SearchState::MinimizedATM animated:YES];
+}
+
+- (void)collapseSearchOnTimer { [self setSearchState:SearchState::MinimizedNormal animated:YES]; }
 #pragma mark - MWMNavigationDashboardInfoProtocol
 
 - (void)updateNavigationInfo:(MWMNavigationDashboardEntity *)info
@@ -119,6 +204,37 @@ CGFloat constexpr kTurnsiPadWidth = 140;
   self.hidden = self.streetNameView.hidden && self.turnsView.hidden;
 }
 
+- (void)layoutSearch
+{
+  BOOL const defaultView = defaultOrientation();
+  self.searchMainButtonBottomOffset.constant =
+      defaultView ? kSearchMainButtonBottomOffsetPortrait : kSearchMainButtonBottomOffsetLandscape;
+  CGFloat alpha = 1;
+  CGFloat searchButtonsSideSize = kSearchButtonsSideSize;
+  if (self.searchState == SearchState::Maximized)
+  {
+    self.searchButtonsViewWidth.constant =
+        defaultView ? kSearchButtonsViewWidthPortrait : kSearchButtonsViewWidthLandscape;
+    self.searchButtonsViewHeight.constant =
+        defaultView ? kSearchButtonsViewHeightPortrait : kSearchButtonsViewHeightLandscape;
+  }
+  else
+  {
+    self.searchButtonsViewWidth.constant = 0;
+    self.searchButtonsViewHeight.constant = 0;
+    alpha = 0;
+    searchButtonsSideSize = 0;
+  }
+  for (UIButton * searchButton in self.searchButtons)
+    searchButton.alpha = alpha;
+  UILayoutPriority const priority =
+      defaultView ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;
+  for (NSLayoutConstraint * constraint in self.searchLandscapeConstraints)
+    constraint.priority = priority;
+  for (NSLayoutConstraint * constraint in self.searchButtonsSideSize)
+    constraint.constant = searchButtonsSideSize;
+}
+
 #pragma mark - MWMLocationObserver
 
 - (void)onHeadingUpdate:(location::CompassInfo const &)info
@@ -134,8 +250,102 @@ CGFloat constexpr kTurnsiPadWidth = 140;
   self.nextTurnImageView.transform = CGAffineTransformMakeRotation(M_PI_2 - angle);
 }
 
+#pragma mark - SolidTouchView
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  if (self.searchState == SearchState::Maximized)
+    return;
+  [super touchesBegan:touches withEvent:event];
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  if (self.searchState == SearchState::Maximized)
+    return;
+  [super touchesMoved:touches withEvent:event];
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  if (self.searchState == SearchState::Maximized)
+    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+  else
+    [super touchesEnded:touches withEvent:event];
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  if (self.searchState == SearchState::Maximized)
+    [self setSearchState:SearchState::MinimizedNormal animated:YES];
+  else
+    [super touchesCancelled:touches withEvent:event];
+}
+
 #pragma mark - Properties
 
+- (void)setFrame:(CGRect)frame
+{
+  if (CGRectEqualToRect(self.frame, frame))
+    return;
+  super.frame = frame;
+  [self layoutIfNeeded];
+  [self layoutSearch];
+  [UIView animateWithDuration:kDefaultAnimationDuration
+                   animations:^{
+                     self.searchButtonsView.layer.cornerRadius =
+                         (defaultOrientation() ? kSearchButtonsViewHeightPortrait
+                                               : kSearchButtonsViewHeightLandscape) /
+                         2;
+                     [self layoutIfNeeded];
+                   }];
+}
+
+- (void)setSearchState:(SearchState)searchState animated:(BOOL)animated
+{
+  self.searchState = searchState;
+  auto block = ^{
+    [self layoutSearch];
+    [self layoutIfNeeded];
+  };
+  if (animated)
+  {
+    [self layoutIfNeeded];
+    [UIView animateWithDuration:kDefaultAnimationDuration animations:block];
+  }
+  else
+  {
+    block();
+  }
+  SEL const collapseSelector = @selector(collapseSearchOnTimer);
+  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:collapseSelector object:self];
+  if (self.searchState == SearchState::Maximized)
+  {
+    [self.superview bringSubviewToFront:self];
+    [self performSelector:collapseSelector withObject:self afterDelay:kCollapseSearchTimeout];
+  }
+  else
+  {
+    [self.superview sendSubviewToBack:self];
+  }
+}
+
+- (void)setSearchState:(SearchState)searchState
+{
+  _searchState = searchState;
+  self.searchMainButton.imageName = kSearchStateButtonImageNames.at(searchState);
+}
+
+- (void)setIsVisible:(BOOL)isVisible
+{
+  _isVisible = isVisible;
+  [self setNeedsLayout];
+  if (isVisible && [MWMRouter router].type == routing::RouterType::Pedestrian)
+    [MWMLocationManager addObserver:self];
+  else
+    [MWMLocationManager removeObserver:self];
+}
+
 - (CGRect)defaultFrame
 {
   return CGRectMake(self.leftBound, 0.0, self.superview.width - self.leftBound,
@@ -148,4 +358,9 @@ CGFloat constexpr kTurnsiPadWidth = 140;
   [self setNeedsLayout];
 }
 
+- (CGFloat)extraCompassBottomOffset
+{
+  return defaultOrientation() || self.searchView.hidden ? 0 : kSearchButtonsViewHeightLandscape;
+}
+
 @end

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationInfoView.xib

@@ -22,7 +22,7 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ленинградский проспект" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ShI-bz-5g8">
                             <rect key="frame" x="112" y="32" width="480" height="21"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -32,7 +32,7 @@
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstItem="ShI-bz-5g8" firstAttribute="top" secondItem="YYv-pG-Wkw" secondAttribute="top" constant="32" id="KK1-dA-hII"/>
-                        <constraint firstAttribute="trailing" secondItem="ShI-bz-5g8" secondAttribute="trailing" constant="8" id="ZPY-xp-9Ew"/>
+                        <constraint firstAttribute="trailing" secondItem="ShI-bz-5g8" secondAttribute="trailing" priority="999" constant="8" id="ZPY-xp-9Ew"/>
                         <constraint firstAttribute="bottom" secondItem="ShI-bz-5g8" secondAttribute="bottom" constant="12" id="w0r-Ip-f9E"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
@@ -92,12 +92,18 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Zu-Ff-6p2" userLabel="Second turn">
                             <rect key="frame" x="0.0" y="121" width="96" height="32"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CKi-sy-dNO">
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CKi-sy-dNO">
                                     <rect key="frame" x="36" y="4" width="24" height="24"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="24" id="4ye-1W-bU2"/>
+                                        <constraint firstAttribute="height" constant="24" id="Fxo-9b-MUJ"/>
+                                    </constraints>
                                 </imageView>
                             </subviews>
                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
                             <constraints>
+                                <constraint firstItem="CKi-sy-dNO" firstAttribute="centerX" secondItem="8Zu-Ff-6p2" secondAttribute="centerX" id="dmg-3w-VeP"/>
+                                <constraint firstItem="CKi-sy-dNO" firstAttribute="centerY" secondItem="8Zu-Ff-6p2" secondAttribute="centerY" id="kDl-Jt-3ST"/>
                                 <constraint firstAttribute="height" constant="32" id="n57-ET-oyc"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
@@ -120,26 +126,202 @@
                         <constraint firstItem="wt8-EO-MKz" firstAttribute="top" secondItem="Aa6-N8-acP" secondAttribute="top" id="v5F-4v-Sfr"/>
                     </constraints>
                 </view>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ixv-dD-46I" userLabel="Search View">
+                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TMW-aw-1RT">
+                            <rect key="frame" x="-70" y="296" width="200" height="200"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Bv-7H-IZt" userLabel="Gas" customClass="MWMButton">
+                                    <rect key="frame" x="78" y="14" width="44" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" priority="750" constant="44" id="KKe-fH-h2n"/>
+                                        <constraint firstAttribute="height" priority="750" constant="44" id="UEW-5h-9Jk"/>
+                                    </constraints>
+                                    <state key="normal" image="ic_routing_fuel_on"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="sxM-U8-yee"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RP3-01-Pj7" userLabel="Parking" customClass="MWMButton">
+                                    <rect key="frame" x="122" y="34" width="44" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" priority="750" constant="44" id="iq3-j8-GZG"/>
+                                        <constraint firstAttribute="width" priority="750" constant="44" id="lwq-aN-y8y"/>
+                                    </constraints>
+                                    <state key="normal" image="ic_routing_parking_on"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="uiN-0q-kol"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GcK-FI-VXw" userLabel="Food" customClass="MWMButton">
+                                    <rect key="frame" x="142" y="78" width="44" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" priority="750" constant="44" id="euI-Cb-zo4"/>
+                                        <constraint firstAttribute="height" priority="750" constant="44" id="kdi-mH-aab"/>
+                                    </constraints>
+                                    <state key="normal" image="ic_routing_food_on"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="3le-Cd-rvC"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ggf-tc-U3R" userLabel="Shop" customClass="MWMButton">
+                                    <rect key="frame" x="122" y="122" width="44" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" priority="750" constant="44" id="2g5-C3-nTL"/>
+                                        <constraint firstAttribute="height" priority="750" constant="44" id="fKJ-SP-gfS"/>
+                                    </constraints>
+                                    <state key="normal" image="ic_routing_shop_on"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="hkk-Xo-uPg"/>
+                                    </connections>
+                                </button>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uoS-b2-FcN" userLabel="ATM" customClass="MWMButton">
+                                    <rect key="frame" x="78" y="142" width="44" height="44"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" priority="750" constant="44" id="Kvn-g8-63x"/>
+                                        <constraint firstAttribute="height" priority="750" constant="44" id="rwg-ce-ESb"/>
+                                    </constraints>
+                                    <state key="normal" image="ic_routing_atm_on"/>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
+                                    </userDefinedRuntimeAttributes>
+                                    <connections>
+                                        <action selector="searchButtonTouchUpInside:" destination="iN0-l3-epB" eventType="touchUpInside" id="Pqo-CT-Cog"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="GcK-FI-VXw" firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="leading" priority="250" id="89h-kJ-0pV"/>
+                                <constraint firstItem="RP3-01-Pj7" firstAttribute="leading" secondItem="2Bv-7H-IZt" secondAttribute="trailing" priority="250" id="C9o-Bx-KXq"/>
+                                <constraint firstAttribute="height" constant="200" id="ClV-rj-I5W"/>
+                                <constraint firstAttribute="trailing" secondItem="Ggf-tc-U3R" secondAttribute="trailing" priority="500" constant="34" id="Cxa-Ms-3ud"/>
+                                <constraint firstItem="uoS-b2-FcN" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="Fva-Vq-x1E"/>
+                                <constraint firstItem="GcK-FI-VXw" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" id="HaH-4G-jWc"/>
+                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="NcX-Rf-Cvm"/>
+                                <constraint firstAttribute="bottom" secondItem="uoS-b2-FcN" secondAttribute="bottom" priority="500" constant="14" id="Skj-gh-LVA"/>
+                                <constraint firstAttribute="bottom" secondItem="Ggf-tc-U3R" secondAttribute="bottom" priority="500" constant="34" id="ZWZ-hv-s2X"/>
+                                <constraint firstAttribute="trailing" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="500" constant="34" id="ZrU-lQ-I2d"/>
+                                <constraint firstItem="RP3-01-Pj7" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="34" id="eMY-fr-9hS"/>
+                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="top" secondItem="TMW-aw-1RT" secondAttribute="top" priority="500" constant="14" id="eOX-wt-nUe"/>
+                                <constraint firstItem="RP3-01-Pj7" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="iSp-hy-tmq"/>
+                                <constraint firstItem="uoS-b2-FcN" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="j4g-jo-knc"/>
+                                <constraint firstAttribute="trailing" secondItem="GcK-FI-VXw" secondAttribute="trailing" priority="500" constant="14" id="jlf-5n-9UR"/>
+                                <constraint firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="trailing" priority="250" constant="8" id="lOI-E1-KoS"/>
+                                <constraint firstAttribute="width" constant="200" id="mOu-Vw-eLb"/>
+                                <constraint firstItem="GcK-FI-VXw" firstAttribute="leading" secondItem="RP3-01-Pj7" secondAttribute="trailing" priority="250" id="nxu-rz-dZp"/>
+                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="centerX" secondItem="TMW-aw-1RT" secondAttribute="centerX" priority="500" id="s89-b9-XaO"/>
+                                <constraint firstItem="Ggf-tc-U3R" firstAttribute="centerY" secondItem="TMW-aw-1RT" secondAttribute="centerY" priority="250" id="sVL-ni-mon"/>
+                                <constraint firstItem="2Bv-7H-IZt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="TMW-aw-1RT" secondAttribute="leading" id="vbk-wb-RCv"/>
+                                <constraint firstItem="Ggf-tc-U3R" firstAttribute="trailing" secondItem="uoS-b2-FcN" secondAttribute="leading" priority="250" id="vcn-Dj-WUu"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xna-Q1-7zW" customClass="MWMButton">
+                            <rect key="frame" x="4" y="370" width="52" height="52"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="52" id="IJq-4U-XHW"/>
+                                <constraint firstAttribute="height" constant="52" id="cvr-aL-Qfk"/>
+                            </constraints>
+                            <state key="normal" image="ic_routing_search_light"/>
+                            <connections>
+                                <action selector="searchMainButtonTouchUpInside" destination="iN0-l3-epB" eventType="touchUpInside" id="gd5-zu-3i5"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="TMW-aw-1RT" firstAttribute="centerX" secondItem="Xna-Q1-7zW" secondAttribute="centerX" priority="500" id="1Pl-9Y-jWd"/>
+                        <constraint firstItem="TMW-aw-1RT" firstAttribute="centerY" secondItem="Xna-Q1-7zW" secondAttribute="centerY" id="AGD-5W-5H7"/>
+                        <constraint firstItem="TMW-aw-1RT" firstAttribute="leading" secondItem="Xna-Q1-7zW" secondAttribute="leading" priority="250" constant="-2" id="E5M-tf-wE0"/>
+                        <constraint firstItem="Xna-Q1-7zW" firstAttribute="leading" secondItem="ixv-dD-46I" secondAttribute="leading" constant="4" id="i9Y-yZ-H5L"/>
+                        <constraint firstAttribute="bottom" secondItem="Xna-Q1-7zW" secondAttribute="bottom" constant="178" id="tqX-aT-1fV"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="YYv-pG-Wkw" secondAttribute="trailing" id="15D-kN-gda"/>
                 <constraint firstItem="YYv-pG-Wkw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="IBQ-gK-Cpe"/>
+                <constraint firstItem="ixv-dD-46I" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Qbd-eO-MzU"/>
                 <constraint firstItem="YYv-pG-Wkw" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Rd5-Hl-fSF"/>
+                <constraint firstAttribute="bottom" secondItem="ixv-dD-46I" secondAttribute="bottom" id="af4-kO-uKn"/>
                 <constraint firstItem="Aa6-N8-acP" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="28" id="goU-O7-rpS"/>
-                <constraint firstItem="ShI-bz-5g8" firstAttribute="leading" secondItem="Aa6-N8-acP" secondAttribute="trailing" constant="8" id="mdA-B9-tvQ"/>
+                <constraint firstItem="ShI-bz-5g8" firstAttribute="leading" secondItem="Aa6-N8-acP" secondAttribute="trailing" priority="999" constant="8" id="mdA-B9-tvQ"/>
                 <constraint firstItem="Aa6-N8-acP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="pXD-dk-ku2"/>
+                <constraint firstAttribute="trailing" secondItem="ixv-dD-46I" secondAttribute="trailing" id="yjN-n2-p8N"/>
+                <constraint firstItem="ixv-dD-46I" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="z9B-Oj-yrv"/>
             </constraints>
             <connections>
                 <outlet property="distanceToNextTurnLabel" destination="KuR-1J-VI2" id="n0i-t9-Vj2"/>
                 <outlet property="nextTurnImageView" destination="AJe-8N-rpk" id="iMm-9u-rPI"/>
+                <outlet property="searchButtonATM" destination="uoS-b2-FcN" id="OBU-wK-liD"/>
+                <outlet property="searchButtonFood" destination="GcK-FI-VXw" id="c0L-PA-HFw"/>
+                <outlet property="searchButtonGas" destination="2Bv-7H-IZt" id="uch-Sv-2IQ"/>
+                <outlet property="searchButtonParking" destination="RP3-01-Pj7" id="YXz-Jq-WA9"/>
+                <outlet property="searchButtonShop" destination="Ggf-tc-U3R" id="kug-72-6VO"/>
+                <outlet property="searchButtonsView" destination="TMW-aw-1RT" id="bQd-e2-Jey"/>
+                <outlet property="searchButtonsViewHeight" destination="ClV-rj-I5W" id="egz-NO-EAn"/>
+                <outlet property="searchButtonsViewWidth" destination="mOu-Vw-eLb" id="SsK-HE-lHC"/>
+                <outlet property="searchMainButton" destination="Xna-Q1-7zW" id="v48-fa-MQE"/>
+                <outlet property="searchMainButtonBottomOffset" destination="tqX-aT-1fV" id="hfV-xg-ghC"/>
+                <outlet property="searchView" destination="ixv-dD-46I" id="HD8-7c-fRB"/>
                 <outlet property="secondTurnImageView" destination="CKi-sy-dNO" id="A29-2z-4oh"/>
                 <outlet property="secondTurnView" destination="8Zu-Ff-6p2" id="yEK-rY-S50"/>
                 <outlet property="streetNameLabel" destination="ShI-bz-5g8" id="eZd-Es-g0l"/>
                 <outlet property="streetNameView" destination="YYv-pG-Wkw" id="gbk-SH-idq"/>
                 <outlet property="turnsView" destination="Aa6-N8-acP" id="daB-uQ-UFM"/>
                 <outlet property="turnsWidth" destination="6Ja-Xp-g8h" id="kCr-a1-fph"/>
+                <outletCollection property="searchLandscapeConstraints" destination="E5M-tf-wE0" id="y6q-K4-nzY"/>
+                <outletCollection property="searchLandscapeConstraints" destination="NcX-Rf-Cvm" id="vwd-uF-iTf"/>
+                <outletCollection property="searchLandscapeConstraints" destination="iSp-hy-tmq" id="h2M-dj-EiD"/>
+                <outletCollection property="searchLandscapeConstraints" destination="C9o-Bx-KXq" id="5a5-4m-Dyf"/>
+                <outletCollection property="searchLandscapeConstraints" destination="nxu-rz-dZp" id="Y1O-08-buw"/>
+                <outletCollection property="searchLandscapeConstraints" destination="89h-kJ-0pV" id="xBD-bu-bfe"/>
+                <outletCollection property="searchLandscapeConstraints" destination="sVL-ni-mon" id="DTz-eP-FWo"/>
+                <outletCollection property="searchLandscapeConstraints" destination="j4g-jo-knc" id="EG6-ya-ahs"/>
+                <outletCollection property="searchLandscapeConstraints" destination="vcn-Dj-WUu" id="kjW-Jd-TLm"/>
+                <outletCollection property="searchLandscapeConstraints" destination="lOI-E1-KoS" id="Zeu-Nj-vBU"/>
+                <outletCollection property="searchButtons" destination="2Bv-7H-IZt" id="co8-GL-K6m"/>
+                <outletCollection property="searchButtons" destination="RP3-01-Pj7" id="1nL-Ib-y49"/>
+                <outletCollection property="searchButtons" destination="GcK-FI-VXw" id="Ykw-0h-Emh"/>
+                <outletCollection property="searchButtons" destination="Ggf-tc-U3R" id="FIp-4y-5eA"/>
+                <outletCollection property="searchButtons" destination="uoS-b2-FcN" id="1Ly-Ve-2RT"/>
+                <outletCollection property="searchButtonsSideSize" destination="KKe-fH-h2n" id="Okh-Is-iMi"/>
+                <outletCollection property="searchButtonsSideSize" destination="UEW-5h-9Jk" id="ZWN-om-GgR"/>
+                <outletCollection property="searchButtonsSideSize" destination="iq3-j8-GZG" id="WjZ-71-4er"/>
+                <outletCollection property="searchButtonsSideSize" destination="lwq-aN-y8y" id="hmh-cr-pZk"/>
+                <outletCollection property="searchButtonsSideSize" destination="euI-Cb-zo4" id="W8L-Ax-Ks1"/>
+                <outletCollection property="searchButtonsSideSize" destination="kdi-mH-aab" id="Kof-TU-UYG"/>
+                <outletCollection property="searchButtonsSideSize" destination="2g5-C3-nTL" id="hKe-PI-ohQ"/>
+                <outletCollection property="searchButtonsSideSize" destination="fKJ-SP-gfS" id="hmq-Zw-cVL"/>
+                <outletCollection property="searchButtonsSideSize" destination="Kvn-g8-63x" id="EBu-lt-pbc"/>
+                <outletCollection property="searchButtonsSideSize" destination="rwg-ce-ESb" id="jHF-yA-fAg"/>
             </connections>
         </view>
     </objects>
+    <resources>
+        <image name="ic_routing_atm_on" width="24" height="24"/>
+        <image name="ic_routing_food_on" width="24" height="24"/>
+        <image name="ic_routing_fuel_on" width="24" height="24"/>
+        <image name="ic_routing_parking_on" width="24" height="24"/>
+        <image name="ic_routing_search_light" width="52" height="52"/>
+        <image name="ic_routing_shop_on" width="24" height="24"/>
+    </resources>
 </document>

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib

@@ -104,8 +104,8 @@
                         <constraint firstItem="wpf-tw-Coz" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" id="bK5-4Q-Rv9"/>
                         <constraint firstItem="wpf-tw-Coz" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" id="cPc-fO-vAa"/>
                         <constraint firstItem="0YR-3a-ucN" firstAttribute="width" secondItem="DMt-LJ-mzn" secondAttribute="width" id="evf-UV-KzK"/>
-                        <constraint firstAttribute="trailing" secondItem="DrK-vI-WkO" secondAttribute="trailing" constant="8" id="jom-uc-MN0"/>
-                        <constraint firstItem="DrK-vI-WkO" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" constant="8" id="kYp-Bb-6dW"/>
+                        <constraint firstAttribute="trailing" secondItem="DrK-vI-WkO" secondAttribute="trailing" priority="999" constant="8" id="jom-uc-MN0"/>
+                        <constraint firstItem="DrK-vI-WkO" firstAttribute="leading" secondItem="WqK-Yb-PmP" secondAttribute="leading" priority="999" constant="8" id="kYp-Bb-6dW"/>
                         <constraint firstItem="DMt-LJ-mzn" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" constant="12" id="qWW-1y-zZG"/>
                         <constraint firstItem="0YR-3a-ucN" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" constant="12" id="zKm-WW-91Y"/>
                     </constraints>
@@ -233,15 +233,15 @@
                     <constraints>
                         <constraint firstItem="8Fm-p4-iHv" firstAttribute="centerY" secondItem="Sr7-UO-G0z" secondAttribute="centerY" id="6Bj-GR-HOL"/>
                         <constraint firstItem="OOA-K7-ybj" firstAttribute="centerY" secondItem="Sr7-UO-G0z" secondAttribute="centerY" id="6Uv-dg-Un3"/>
-                        <constraint firstAttribute="trailing" secondItem="tjE-md-mqu" secondAttribute="trailing" constant="12" id="99x-Ja-4UF"/>
+                        <constraint firstAttribute="trailing" secondItem="tjE-md-mqu" secondAttribute="trailing" priority="999" constant="12" id="99x-Ja-4UF"/>
                         <constraint firstItem="OOA-K7-ybj" firstAttribute="leading" secondItem="oQc-l8-sZH" secondAttribute="trailing" id="TAE-ae-pa6"/>
                         <constraint firstItem="tjE-md-mqu" firstAttribute="centerY" secondItem="Sr7-UO-G0z" secondAttribute="centerY" id="ikK-X1-3S9"/>
                         <constraint firstItem="oQc-l8-sZH" firstAttribute="centerY" secondItem="Sr7-UO-G0z" secondAttribute="centerY" id="jmL-Ol-DwJ"/>
-                        <constraint firstItem="oQc-l8-sZH" firstAttribute="leading" secondItem="Sr7-UO-G0z" secondAttribute="leading" constant="8" id="kJx-Hv-da4"/>
+                        <constraint firstItem="oQc-l8-sZH" firstAttribute="leading" secondItem="Sr7-UO-G0z" secondAttribute="leading" priority="999" constant="8" id="kJx-Hv-da4"/>
                         <constraint firstItem="8Fm-p4-iHv" firstAttribute="leading" secondItem="oQc-l8-sZH" secondAttribute="trailing" id="pPr-SX-Yd8"/>
                         <constraint firstAttribute="height" constant="48" id="tZt-LS-raP"/>
-                        <constraint firstAttribute="trailing" secondItem="OOA-K7-ybj" secondAttribute="trailing" constant="12" id="uFe-u5-hEf"/>
-                        <constraint firstAttribute="trailing" secondItem="8Fm-p4-iHv" secondAttribute="trailing" constant="12" id="wk4-wb-LAg"/>
+                        <constraint firstAttribute="trailing" secondItem="OOA-K7-ybj" secondAttribute="trailing" priority="999" constant="12" id="uFe-u5-hEf"/>
+                        <constraint firstAttribute="trailing" secondItem="8Fm-p4-iHv" secondAttribute="trailing" priority="999" constant="12" id="wk4-wb-LAg"/>
                         <constraint firstItem="tjE-md-mqu" firstAttribute="leading" secondItem="oQc-l8-sZH" secondAttribute="trailing" id="yVc-kD-ck6"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>

iphone/Maps/Classes/Routing/MWMRouter.h

@@ -13,9 +13,6 @@
 - (void)swapPointsAndRebuild;
 - (void)buildFromPoint:(MWMRoutePoint const &)start bestRouter:(BOOL)bestRouter;
 - (void)buildToPoint:(MWMRoutePoint const &)finish bestRouter:(BOOL)bestRouter;
-- (void)buildFromPoint:(MWMRoutePoint const &)start
-               toPoint:(MWMRoutePoint const &)finish
-            bestRouter:(BOOL)bestRouter;
 - (void)rebuildWithBestRouter:(BOOL)bestRouter;
 - (void)start;
 - (void)stop;

iphone/Maps/Classes/Routing/MWMRouter.mm

@@ -115,15 +115,6 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
   [self rebuildWithBestRouter:bestRouter];
 }
 
-- (void)buildFromPoint:(MWMRoutePoint const &)startPoint
-               toPoint:(MWMRoutePoint const &)finishPoint
-            bestRouter:(BOOL)bestRouter
-{
-  self.startPoint = startPoint.IsValid() ? startPoint : lastLocationPoint();
-  self.finishPoint = finishPoint.IsValid() ? finishPoint : lastLocationPoint();
-  [self rebuildWithBestRouter:bestRouter];
-}
-
 - (void)rebuildWithBestRouter:(BOOL)bestRouter
 {
   if (self.startPoint.IsMyPosition())

iphone/Maps/Classes/Widgets/MWMMapWidgets.mm

@@ -1,4 +1,5 @@
 #import "MWMMapWidgets.h"
+#import "MWMNavigationDashboardManager.h"
 
 #include "drape_frontend/gui/skin.hpp"
 #include "std/unique_ptr.hpp"
@@ -56,8 +57,12 @@
           pivot -= m2::PointF(0.0, self.bottomBound * self.visualScale);
           break;
         case gui::WIDGET_COMPASS:
-          pivot += m2::PointF(self.leftBound, -self.bottomBound) * self.visualScale;
+        {
+          CGFloat const compassBottomBound =
+              self.bottomBound + [MWMNavigationDashboardManager manager].extraCompassBottomOffset;
+          pivot += m2::PointF(self.leftBound, -compassBottomBound) * self.visualScale;
           break;
+        }
         case gui::WIDGET_SCALE_LABEL:
         case gui::WIDGET_CHOOSE_POSITION_MARK:
           break;

iphone/Maps/Images.xcassets/NavigationDashboard/Search/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_off.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_off_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_off_highlighted_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_off_highlighted_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_highlighted_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_off_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_off_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_atm_on.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_on.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_on@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_atm_on@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_highlighted_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_highlighted_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_highlighted_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_off_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_off_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_food_on.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_on.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_on@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_food_on@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_off.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_off_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_off_highlighted_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_off_highlighted_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_highlighted_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_off_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_off_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_fuel_on.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_on.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_on@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_fuel_on@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_parking_off.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_parking_off_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_parking_off_highlighted_dark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_dark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_dark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_dark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iphone/Maps/Images.xcassets/NavigationDashboard/Search/ic_routing_parking_off_highlighted_light.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_light.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_light@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_routing_parking_off_highlighted_light@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}