diff --git a/map/framework.cpp b/map/framework.cpp index 4836bcf108..74955250d7 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -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; diff --git a/search/house_detector.cpp b/search/house_detector.cpp index 4ac6443e96..f6f1cfdedb 100644 --- a/search/house_detector.cpp +++ b/search/house_detector.cpp @@ -1081,11 +1081,11 @@ void ProcessNearbyHouses(vector 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 & q) @@ -1328,29 +1328,29 @@ void LongestSubsequence(vector 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 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 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 res; - LongestSubsequence(v, res); +// vector 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 {