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

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2014-07-07 14:00:19 +02:00 • committed by Alex Zolotarev
parent a61df0e73e
commit 64bc17a05f
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -195,8 +195,8 @@ Framework::Framework()
m_benchmarkEngine(0),
m_bmManager(*this),
m_balloonManager(*this),
m_locationChangedSlotID(-1),
m_fixedSearchResults(0)
m_fixedSearchResults(0),
m_locationChangedSlotID(-1)
{
// Checking whether we should enable benchmark.
bool isBenchmarkingEnabled = false;

46
search/house_detector.cpp
View file

@ -1081,11 +1081,11 @@ void ProcessNearbyHouses(vector<HouseProjection const *> const & v, ResultAccumu
}
}
void GetClosestHouse(MergedStreet const & st, ResultAccumulator & acc)
{
for (MergedStreet::Index i = st.Begin(); !st.IsEnd(i); st.Inc(i))
acc.ProcessCandidate(st.Get(i));
}
//void GetClosestHouse(MergedStreet const & st, ResultAccumulator & acc)
//{
// for (MergedStreet::Index i = st.Begin(); !st.IsEnd(i); st.Inc(i))
// acc.ProcessCandidate(st.Get(i));
//}
// If it's odd or even part of the street pass 2, else pass 1.
void AddToQueue(int houseNumber, int step, queue<int> & q)
@ -1328,29 +1328,29 @@ void LongestSubsequence(vector<HouseProjection const *> const & v,
LongestSubsequence(v, back_inserter(res), CompareHouseNumber());
}
void GetLSHouse(MergedStreet const & st, double offsetMeters, ResultAccumulator & acc)
{
acc.ResetNearby();
//void GetLSHouse(MergedStreet const & st, double offsetMeters, ResultAccumulator & acc)
//{
// acc.ResetNearby();
vector<HouseProjection const *> v;
for (MergedStreet::Index i = st.Begin(); !st.IsEnd(i); st.Inc(i))
{
search::HouseProjection const & p = st.Get(i);
if (p.m_distance <= offsetMeters && acc.IsOurSide(p))
v.push_back(&p);
}
// vector<HouseProjection const *> v;
// for (MergedStreet::Index i = st.Begin(); !st.IsEnd(i); st.Inc(i))
// {
// search::HouseProjection const & p = st.Get(i);
// if (p.m_distance <= offsetMeters && acc.IsOurSide(p))
// v.push_back(&p);
// }
vector<HouseProjection const *> res;
LongestSubsequence(v, res);
// vector<HouseProjection const *> res;
// LongestSubsequence(v, res);
//LOG(LDEBUG, ("=== Offset", offsetMeters, "==="));
//LogSequence(res);
// //LOG(LDEBUG, ("=== Offset", offsetMeters, "==="));
// //LogSequence(res);
for (size_t i = 0; i < res.size(); ++i)
acc.MatchCandidate(*(res[i]), true);
// for (size_t i = 0; i < res.size(); ++i)
// acc.MatchCandidate(*(res[i]), true);
ProcessNearbyHouses(v, acc);
}
// ProcessNearbyHouses(v, acc);
//}
struct GreaterSecond
{