Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2017-12-08 18:51:42 +0300
committerIlya Grechuhin <i.grechuhin@gmail.com>2017-12-14 14:10:18 +0300
commitc13d79f2bb648357c8d72aaa9db91c088a4c598a (patch)
tree996e625bbb4bf6934e390ab21e267a4b76855cb3 /drape_frontend/user_mark_shapes.cpp
parentb27a62f7e788dea4b32e18776710acdbe4237eb3 (diff)
Fixed display of a routing mark text.
Diffstat (limited to 'drape_frontend/user_mark_shapes.cpp')
-rw-r--r--drape_frontend/user_mark_shapes.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index fe01d6d9d5..06eeb1eb64 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -239,19 +239,20 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
params.m_depthLayer = renderInfo.m_depthLayer;
params.m_minVisibleScale = renderInfo.m_minZoom;
- uint32_t overlayIndex = 0;
+ uint32_t const overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
if (renderInfo.m_hasTitlePriority)
{
params.m_specialDisplacement = SpecialDisplacement::UserMark;
params.m_specialPriority = renderInfo.m_priority;
- overlayIndex = kStartUserMarkOverlayIndex + renderInfo.m_index;
-
params.m_startOverlayRank = dp::OverlayRank0;
- if (renderInfo.m_symbolNames != nullptr)
- params.m_startOverlayRank++;
- if (renderInfo.m_coloredSymbols != nullptr)
- params.m_startOverlayRank++;
- ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
+ if (renderInfo.m_hasSymbolPriority)
+ {
+ if (renderInfo.m_symbolNames != nullptr)
+ params.m_startOverlayRank++;
+ if (renderInfo.m_coloredSymbols != nullptr)
+ params.m_startOverlayRank++;
+ ASSERT_LESS(params.m_startOverlayRank, dp::OverlayRanksCount, ());
+ }
}
if (renderInfo.m_symbolSizes != nullptr)