diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-11-24 19:16:29 +0300 |
---|---|---|
committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-11-28 16:47:49 +0300 |
commit | 8a93bee586e89e88f72818fa151e3484fd0252ee (patch) | |
tree | 2fa72d87c017a9c3b57ca68828f5768ca6e93f6a /drape_frontend/user_mark_shapes.cpp | |
parent | 00d5e176beca0185ae7785b41f35689be81c219d (diff) |
Added min zoom level for user mark's title.
Diffstat (limited to 'drape_frontend/user_mark_shapes.cpp')
-rw-r--r-- | drape_frontend/user_mark_shapes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 2c3a28b373..579cf5a348 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -142,7 +142,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture { ColoredSymbolViewParams params = itSym->second; if (params.m_shape == ColoredSymbolViewParams::Shape::Circle) - symbolSize = m2::PointF(params.m_radiusInPixels, params.m_radiusInPixels); + symbolSize = m2::PointF(params.m_radiusInPixels * 2.0f, params.m_radiusInPixels * 2.0f); else symbolSize = params.m_sizeInPixels; @@ -205,14 +205,14 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture { symbolSize = renderInfo.m_symbolSizes->at(static_cast<size_t>(tileKey.m_zoomLevel - 1)) * vs; } - else + else if (!symbolName.empty()) { textures->GetSymbolRegion(symbolName, region); symbolSize.x = max(region.GetPixelSize().x, symbolSize.x); symbolSize.y = max(region.GetPixelSize().y, symbolSize.y); } - if (renderInfo.m_titleDecl != nullptr) + if (renderInfo.m_titleDecl != nullptr && renderInfo.m_minTitleZoom <= tileKey.m_zoomLevel) { for (auto const & titleDecl : *renderInfo.m_titleDecl) { |