gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[new downloader][ios] Fixed build.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-02-05 14:10:29 +03:00 • committed by Sergey Yershov
parent 210178c9f3
commit 8ab5510ca0
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -209,7 +209,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
[self updateTopController];
NodeAttrs attrs;
GetFramework().Storage().GetNodeAttrs(countryId, attrs);
if (IsDownloadFailed(attrs.m_status))
if (attrs.m_status == NodeStatus::Error)
[self.downloadController setDownloadFailed];
if (self.state == MWMSearchManagerStateTableSearch || self.state == MWMSearchManagerStateMapSearch)
{
@ -220,7 +220,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
}
}
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::LocalAndRemoteSizeT const &)progress
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::TLocalAndRemoteSize const &)progress
{
using namespace storage;
CGFloat const normProgress = (CGFloat)progress.first / progress.second;

2
iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
View file

@ -158,7 +158,7 @@ void loopWrappers(TObservers * observers, TLoopBlock block)
[observer processCountryEvent:countryId];
});
},
[observers](storage::TCountryId const & countryId, storage::LocalAndRemoteSizeT const & progress)
[observers](storage::TCountryId const & countryId, storage::TLocalAndRemoteSize const & progress)
{
loopWrappers(observers, ^(TStorageObserver observer)
{

3
iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
View file

@ -38,6 +38,7 @@
@optional
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::LocalAndRemoteSizeT const &)progress;
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::TLocalAndRemoteSize const &)progress;
@end

2
iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
View file

@ -89,7 +89,7 @@ static int gStorageSubscriptionId = kNotSubscribed;
});
[Alohalytics logEvent:kDownloadedSecondMapEvent];
}
}, [](storage::TCountryId const &, storage::LocalAndRemoteSizeT const &){});
}, [](storage::TCountryId const &, storage::TLocalAndRemoteSize const &){});
}
}
}