kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #5553 from igrechuhin/search-timestamp

Browse source 
[search-timestamp] [ios] Changed search callback stamp to increment c…
This commit is contained in:
Yuri Gorshenin 2017-03-10 13:36:47 +03:00 • committed by GitHub
commit c5e24cb5f7
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/Core/Search/MWMSearch.mm
View file

@ -27,7 +27,7 @@ using TObservers = NSHashTable<__kindof TObserver>;
@property(nonatomic) TObservers * observers;
@property(nonatomic) NSTimeInterval lastSearchTimestamp;
@property(nonatomic) NSUInteger lastSearchStamp;
@property(nonatomic) BOOL isHotelResults;
@property(nonatomic) MWMSearchFilterViewController * filter;
@ -69,15 +69,14 @@ using TObservers = NSHashTable<__kindof TObserver>;
- (void)updateCallbacks
{
NSTimeInterval const timestamp = [NSDate date].timeIntervalSince1970;
self.lastSearchTimestamp = timestamp;
NSUInteger const timestamp = ++self.lastSearchStamp;
{
__weak auto weakSelf = self;
m_everywhereParams.m_onResults = [weakSelf, timestamp](search::Results const & results) {
__strong auto self = weakSelf;
if (!self)
return;
if (timestamp != self.lastSearchTimestamp)
if (timestamp != self.lastSearchStamp)
return;
if (results.IsEndMarker())
{
@ -220,7 +219,7 @@ using TObservers = NSHashTable<__kindof TObserver>;
+ (void)reset
{
MWMSearch * manager = [MWMSearch manager];
manager.lastSearchTimestamp = 0;
manager.lastSearchStamp++;
GetFramework().CancelAllSearches();
manager.everywhereSearchCompleted = NO;
manager.viewportSearchCompleted = NO;