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

[new downloader] git-clang-format.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-03-23 11:24:03 +03:00 • committed by Sergey Yershov
parent a46d481693
commit ed81964194
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
View file

@ -22,7 +22,8 @@ extern NSString * const kPlaceCellIdentifier;
self = [super initWithDelegate:delegate];
if (self)
{
NSMutableOrderedSet<NSString *> * nsSearchCountryIds = [NSMutableOrderedSet orderedSetWithCapacity:results.m_results.size()];
NSMutableOrderedSet<NSString *> * nsSearchCountryIds =
[NSMutableOrderedSet orderedSetWithCapacity:results.m_results.size()];
NSMutableDictionary<NSString *, NSString *> * nsSearchResults = [@{} mutableCopy];
for (auto const & result : results.m_results)
{

3
map/framework.cpp
View file

@ -1095,7 +1095,8 @@ bool Framework::SearchInDownloader(DownloaderSearchParams const & params)
TCountryId const & countryId = CountryInfoGetter().GetRegionCountryId(mercator);
if (countryId == kInvalidCountryId)
continue;
downloaderSearchResults.m_results.emplace_back(countryId, it->GetString() /* m_matchedName */);
downloaderSearchResults.m_results.emplace_back(countryId,
it->GetString() /* m_matchedName */);
}
downloaderSearchResults.m_query = params.m_query;
downloaderSearchResults.m_endMarker = results.IsEndMarker();

4
storage/downloader_search_params.hpp
View file

@ -11,7 +11,9 @@ namespace storage
struct DownloaderSearchResult
{
DownloaderSearchResult(TCountryId const & countryId, string const & matchedName)
: m_countryId(countryId), m_matchedName(matchedName) {}
: m_countryId(countryId), m_matchedName(matchedName)
{
}
TCountryId m_countryId;
/// \brief |m_matchedName| is a name of found feature in case of searching in World.mwm