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

[drape] use upper style zoom for 18 and 19 zoom levels

Browse source 
also guard DoNeedReadIndex by mutex.

is's need in situations when one tile info was push to back of thread pool, and than push to front and processed on separate threads in one time.
This commit is contained in:
ExMix 2014-02-07 12:35:48 +03:00 • committed by Alex Zolotarev
parent 1917aca0bd
commit 9fbb9f2019
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drape_frontend/tile_info.cpp
View file

@ -43,11 +43,11 @@ namespace df
void TileInfo::ReadFeatureIndex(model::FeaturesFetcher const & model)
{
threads::MutexGuard guard(m_mutex);
if (DoNeedReadIndex())
{
threads::MutexGuard guard(m_mutex);
CheckCanceled();
model.ForEachFeatureID(GetGlobalRect(), *this, m_key.m_zoomLevel);
model.ForEachFeatureID(GetGlobalRect(), *this, GetZoomLevel());
sort(m_featureInfo.begin(), m_featureInfo.end());
}
}
@ -91,7 +91,7 @@ namespace df
void TileInfo::InitStylist(const FeatureType & f, Stylist & s)
{
CheckCanceled();
df::InitStylist(f, m_key.m_zoomLevel, s);
df::InitStylist(f, GetZoomLevel(), s);
}
//====================================================//
@ -112,4 +112,10 @@ namespace df
if (m_isCanceled)
MYTHROW(ReadCanceledException, ());
}
int TileInfo::GetZoomLevel() const
{
int upperScale = scales::GetUpperScale();
return m_key.m_zoomLevel <= upperScale ? m_key.m_zoomLevel : upperScale;
}
}

2
drape_frontend/tile_info.hpp
View file

@ -46,6 +46,8 @@ namespace df
void CheckCanceled() const;
bool DoNeedReadIndex() const;
int GetZoomLevel() const;
private:
TileKey m_key;
vector<FeatureInfo> m_featureInfo;