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

[search] Follow-up fixes to #1187.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-01-04 11:25:16 +03:00 • committed by Sergey Yershov
parent 5671384273
commit 4bcf84dbaf
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
search/v2/features_layer_matcher.hpp
View file

@ -100,9 +100,9 @@ private:
vector<m2::PointD> poiCenters(child.m_sortedFeatures->size());
// Initially all features are not processed.
vector<bool> isPOIProcessed(child.m_sortedFeatures->size());
size_t notProcessedPOIs = isPOIProcessed.size();
size_t const numPOIs = child.m_sortedFeatures->size();
vector<bool> isPOIProcessed(numPOIs);
size_t processedPOIs = 0;
for (size_t i = 0; i < child.m_sortedFeatures->size(); ++i)
{
@ -111,7 +111,7 @@ private:
poiCenters[i] = feature::GetCenter(poiFt, FeatureType::WORST_GEOMETRY);
}
for (size_t i = 0; i < parent.m_sortedFeatures->size() && notProcessedPOIs != 0; ++i)
for (size_t i = 0; i < parent.m_sortedFeatures->size() && processedPOIs != numPOIs; ++i)
{
BailIfCancelled(m_cancellable);
@ -128,7 +128,7 @@ private:
{
fn((*child.m_sortedFeatures)[j], (*parent.m_sortedFeatures)[i]);
isPOIProcessed[j] = true;
--notProcessedPOIs;
++processedPOIs;
}
}
}

2
search/v2/features_layer_path_finder.hpp
View file

@ -46,7 +46,7 @@ public:
// TODO (@y): remove following code as soon as
// FindReachableVertices() will work fast for most cases
// (significanly less than 1 second).
// (significantly less than 1 second).
#if defined(DEBUG)
fprintf(stderr, "FeaturesLayerPathFinder()\n");
for (auto const * layer : layers)

2
search/v2/geocoder.cpp
View file

@ -112,7 +112,7 @@ void Geocoder::SetParams(Params const & params)
void Geocoder::Go(vector<FeatureID> & results)
{
// TODO (@y): remove following code as soon as Geocoder::Go() will
// work fast for most cases (significanly less than 1 second).
// work fast for most cases (significantly less than 1 second).
#if defined(DEBUG)
my::Timer timer;
MY_SCOPE_GUARD(printDuration, [&timer]()