Merge pull request #6127 from igrechuhin/cherry

Cherry

base/buffer_vector.hpp

@@ -224,10 +224,7 @@ public:
   T const * data() const
   {
     if (IsDynamic())
-    {
-      ASSERT(!m_dynamic.empty(), ());
-      return &m_dynamic[0];
-    }
+      return m_dynamic.data();
 
     return &m_static[0];
   }
@@ -235,10 +232,7 @@ public:
   T * data()
   {
     if (IsDynamic())
-    {
-      ASSERT(!m_dynamic.empty(), ());
-      return &m_dynamic[0];
-    }
+      return m_dynamic.data();
 
     return &m_static[0];
   }

iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm

@@ -120,7 +120,7 @@ NSArray<UIImage *> * imagesWithName(NSString * name)
     CGFloat const leftOffset =
         self.hidden ? -self.view.width : self.leftBound + kViewControlsOffsetToBounds;
     UIView * ov = self.view.superview;
-    [ov layoutIfNeeded];
+    [ov setNeedsLayout];
     self.topOffset.constant = topOffset;
     self.leftOffset.constant = leftOffset;
     [UIView animateWithDuration:kDefaultAnimationDuration

iphone/Maps/Classes/MapsAppDelegate.mm

@@ -747,7 +747,10 @@ using namespace osm_auth_ios;
   m_sourceApplication = sourceApplication;
 
   if ([self checkLaunchURL:url])
+  {
+    [self handleURLs];
     return YES;
+  }
 
   return [[FBSDKApplicationDelegate sharedInstance] application:application
                                                         openURL:url

iphone/Maps/Core/Search/MWMSearch.mm

@@ -88,6 +88,11 @@ using TObservers = NSHashTable<__kindof TObserver>;
         return;
       if (timestamp != self.lastSearchStamp)
         return;
+
+      self->m_everywhereResults = results;
+      self->m_isLocalAdsCustomer = isLocalAdsCustomer;
+      self.suggestionsCount = results.GetSuggestsCount();
+
       if (results.IsEndMarker())
       {
         [self checkIsHotelResults:results];
@@ -106,9 +111,6 @@ using TObservers = NSHashTable<__kindof TObserver>;
       }
       else
       {
-        self->m_everywhereResults = results;
-        self->m_isLocalAdsCustomer = isLocalAdsCustomer;
-        self.suggestionsCount = results.GetSuggestsCount();
         [self updateItemsIndexWithBannerReload:NO];
         [self onSearchResultsUpdated];
       }

iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm

@@ -148,6 +148,7 @@
   BOOL const noResults = [MWMSearch resultsCount] == 0;
   self.tableView.hidden = noResults;
   [(MWMSearchTableView *)self.view hideNoResultsView:!noResults];
+  [self reloadData];
 }
 
 - (void)onSearchResultsUpdated

map/framework.cpp

@@ -1748,7 +1748,8 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
     SearchMarkPoint * mark =
         static_cast<SearchMarkPoint *>(guard.m_controller.CreateUserMark(r.GetFeatureCenter()));
     ASSERT_EQUAL(mark->GetMarkType(), UserMark::Type::SEARCH, ());
-    if (r.GetResultType() == search::Result::RESULT_FEATURE)
+    auto const isFeature = r.GetResultType() == search::Result::RESULT_FEATURE;
+    if (isFeature)
       mark->SetFoundFeature(r.GetFeatureID());
     mark->SetMatchedName(r.GetString());
 
@@ -1756,7 +1757,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
       mark->SetCustomSymbol("search-booking");
     else if (r.m_metadata.m_isSponsoredBank)
       mark->SetCustomSymbol("search-tinkoff");
-    else if (m_localAdsManager.Contains(r.GetFeatureID()))
+    else if (isFeature && m_localAdsManager.Contains(r.GetFeatureID()))
       mark->SetCustomSymbol("search-adv");
   }
 }

xcode/common.xcconfig

@@ -1,4 +1,4 @@
-CURRENT_PROJECT_VERSION = 7.3.3
+CURRENT_PROJECT_VERSION = 7.3.4
 
 // Paths
 OMIM_ROOT = $(PROJECT_DIR)/../..