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-06-17 15:17:15 +0300
committerYuri Gorshenin <y@maps.me>2016-06-17 17:23:31 +0300
commit6334404df5a5133c81d24932d4683ac2069864d3 (patch)
treefc2bacaa93c3bdafbf7842be23406dadbdb4d870 /search
parent683250079ac00a81920ed9cc101239cee4ed2f9c (diff)
Review fixes.
Diffstat (limited to 'search')
-rw-r--r--search/geocoder.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 1cafb50e73..550c104b5b 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -466,8 +466,8 @@ void Geocoder::SetParams(Params const & params)
}
}
- LOG(LDEBUG, ("Tokens = ", m_params.m_tokens));
- LOG(LDEBUG, ("Prefix tokens = ", m_params.m_prefixTokens));
+ LOG(LDEBUG, ("Tokens =", m_params.m_tokens));
+ LOG(LDEBUG, ("Prefix tokens =", m_params.m_prefixTokens));
LOG(LDEBUG, ("Languages =", m_params.m_langs));
}
@@ -1091,7 +1091,12 @@ void Geocoder::GreedilyMatchStreets()
// arguments.
size_t lastToken = startToken;
+ // When true, no bit vectors were intersected with allFeatures at
+ // all.
bool emptyIntersection = true;
+
+ // When true, allFeatures is in the incomplete state and can't be
+ // used for creation of street layers.
bool incomplete = false;
auto createStreetsLayerAndMatchLowerLayers = [&]()
@@ -1109,8 +1114,13 @@ void Geocoder::GreedilyMatchStreets()
*allFeatures, *m_addressFeatures[tag]);
if (tag < curToken)
{
+ // This is the case for delayed
+ // street synonym. Therefore,
+ // allFeatures is temporarily in the
+ // incomplete state.
allFeatures.Set(move(buffer));
emptyIntersection = false;
+
incomplete = true;
return;
}