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

Load HouseToStreet table only if needed.

Browse source
This commit is contained in:
vng 2016-03-15 20:16:01 +03:00 • committed by Sergey Yershov
parent d00658c7dd
commit 279366ff82
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
search/reverse_geocoder.cpp
View file

@ -50,7 +50,7 @@ void ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD cons
MwmSet::MwmHandle mwmHandle = m_index.GetMwmHandleById(id);
if (mwmHandle.IsAlive())
{
search::v2::MwmContext(move(mwmHandle)).ForEachFeature(rect, addStreet);
search::v2::MwmContext(move(mwmHandle), false).ForEachFeature(rect, addStreet);
sort(streets.begin(), streets.end(), my::CompareBy(&Street::m_distanceMeters));
}
}

6
search/v2/mwm_context.cpp
View file

@ -13,14 +13,14 @@ void CoverRect(m2::RectD const & rect, int scale, covering::IntervalsT & result)
result.insert(result.end(), intervals.begin(), intervals.end());
}
MwmContext::MwmContext(MwmSet::MwmHandle handle)
MwmContext::MwmContext(MwmSet::MwmHandle handle, bool loadH2STable/* = true*/)
: m_handle(move(handle))
, m_value(*m_handle.GetValue<MwmValue>())
, m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_table)
, m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG), m_value.m_factory)
, m_houseToStreetTable(HouseToStreetTable::Load(m_value))
{
ASSERT(m_houseToStreetTable, ());
if (loadH2STable)
m_houseToStreetTable = HouseToStreetTable::Load(m_value);
}
bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const

3
search/v2/mwm_context.hpp
View file

@ -23,7 +23,8 @@ void CoverRect(m2::RectD const & rect, int scale, covering::IntervalsT & result)
/// Now it duplicates "Index" functionality.
struct MwmContext
{
explicit MwmContext(MwmSet::MwmHandle handle);
/// @todo Split this component on more generic/lightweight.
MwmContext(MwmSet::MwmHandle handle, bool loadH2STable = true);
MwmSet::MwmHandle m_handle;
MwmValue & m_value;