Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/search
diff options
context:
space:
mode:
authorYuri Gorshenin <y@maps.me>2016-07-07 17:15:10 +0300
committerYuri Gorshenin <y@maps.me>2016-07-07 17:15:10 +0300
commit96597ba86a3cbb9d1b9bf1d8fa965d84eb91907a (patch)
tree1e67b299fb70647c498a3122e4655e7279175e27 /search
parent00375d8a364682789eef47ec13da3fbdf5000c6c (diff)
Review fixes.
Diffstat (limited to 'search')
-rw-r--r--search/geocoder.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index da5d960d92..be0fc644a6 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -232,12 +232,14 @@ void JoinQueryTokens(QueryParams const & params, size_t curToken, size_t endToke
}
}
-bool GetAffiliationName(FeatureType const & ft, string & affiliation)
+WARN_UNUSED_RESULT bool GetAffiliationName(FeatureType const & ft, string & affiliation)
{
affiliation.clear();
if (ft.GetName(StringUtf8Multilang::kDefaultCode, affiliation) && !affiliation.empty())
return true;
+
+ // As a best effort, we try to read an english name if default name is absent.
if (ft.GetName(StringUtf8Multilang::kEnglishCode, affiliation) && !affiliation.empty())
return true;
return false;
@@ -758,7 +760,10 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
m_infoGetter.GetMatchedRegions(affiliation, region.m_ids);
if (region.m_ids.empty())
- LOG(LWARNING, ("Maps not found for region", region.m_defaultName));
+ {
+ LOG(LWARNING,
+ ("Maps not found for region:", region.m_defaultName, "affiliation:", affiliation));
+ }
++count;
m_regions[type][make_pair(l.m_startToken, l.m_endToken)].push_back(region);