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

[search] generate house number to check with house number step.

Browse source
This commit is contained in:
Kirill Zhdanovich 2014-04-09 15:15:44 +03:00 • committed by Alex Zolotarev
parent 6484ef4cc9
commit 7881f51a5f
1 changed files with 11 additions and 10 deletions

21
search/house_detector.cpp
View file

@ -1074,14 +1074,15 @@ void GetClosestHouse(MergedStreet const & st, ResultAccumulator & acc)
acc.ProcessCandidate(st.Get(i));
}
void AddToQueue(int houseNumber, queue<int> & q)
/// if it's odd or even part of the street pass 2, else pass 1
void AddToQueue(int houseNumber, int step, queue<int> & q)
{
q.push(houseNumber + 2);
if (houseNumber - 2 > 0)
q.push(houseNumber - 2);
if (houseNumber - 4 > 0)
q.push(houseNumber - 4);
q.push(houseNumber + 4);
for (size_t i = 1; i <= 2; ++i)
{
q.push(houseNumber + step * i);
if (houseNumber - step * i > 0)
q.push(houseNumber - step * i);
}
}
struct HouseChain
@ -1211,7 +1212,7 @@ void ProccessHouses(vector<HouseProjection const *> const & st, ResultAccumulato
return;
queue<int> houseNumbersToCheck;
AddToQueue(houseChains[0].houses[0]->m_house->GetIntNumber(), houseNumbersToCheck);
AddToQueue(houseChains[0].houses[0]->m_house->GetIntNumber(), 2, houseNumbersToCheck);
while (numberOfStreetHouses > 0)
{
if (!houseNumbersToCheck.empty())
@ -1261,7 +1262,7 @@ void ProccessHouses(vector<HouseProjection const *> const & st, ResultAccumulato
}
}
if (shouldAddHouseToQueue)
AddToQueue(candidateHouseNumber, houseNumbersToCheck);
AddToQueue(candidateHouseNumber, 2, houseNumbersToCheck);
}
else
{
@ -1272,7 +1273,7 @@ void ProccessHouses(vector<HouseProjection const *> const & st, ResultAccumulato
houseChains.push_back(HouseChain(st[i]));
--numberOfStreetHouses;
used[i] = true;
AddToQueue(st[i]->m_house->GetIntNumber(), houseNumbersToCheck);
AddToQueue(st[i]->m_house->GetIntNumber(), 2, houseNumbersToCheck);
break;
}
}