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

Don't do ForEachFeature_TileDrawing in non-tiling policies.

Browse source
This commit is contained in:
vng 2013-09-15 18:53:25 +03:00 • committed by Alex Zolotarev
parent 1e2d8da585
commit cd60400ef8
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -706,13 +706,14 @@ int Framework::GetDrawScale() const
RenderPolicy::TRenderFn Framework::DrawModelFn()
{
return bind(&Framework::DrawModel, this, _1, _2, _3, _4);
bool const isTiling = m_renderPolicy->IsTiling();
return bind(&Framework::DrawModel, this, _1, _2, _3, _4, isTiling);
}
void Framework::DrawModel(shared_ptr<PaintEvent> const & e,
ScreenBase const & screen,
m2::RectD const & renderRect,
int baseScale)
int baseScale, bool isTilingQuery)
{
m2::RectD selectRect;
m2::RectD clipRect;
@ -727,10 +728,10 @@ void Framework::DrawModel(shared_ptr<PaintEvent> const & e,
try
{
int const upperScale = scales::GetUpperScale();
if (drawScale <= upperScale)
if (isTilingQuery && drawScale <= upperScale)
m_model.ForEachFeature_TileDrawing(selectRect, doDraw, drawScale);
else
m_model.ForEachFeature(selectRect, doDraw, upperScale);
m_model.ForEachFeature(selectRect, doDraw, min(upperScale, drawScale));
}
catch (redraw_operation_cancelled const &)
{}

2
map/framework.hpp
View file

@ -260,7 +260,7 @@ public:
void DrawModel(shared_ptr<PaintEvent> const & e,
ScreenBase const & screen,
m2::RectD const & renderRect,
int baseScale);
int baseScale, bool isTilingQuery);
private:
search::Engine * GetSearchEngine() const;