From 78bfa26dbf59c1878d66cabe93ba54de9663c134 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Mon, 6 May 2019 15:52:58 +0300 Subject: [PATCH] [vulkan] Fixed gate icons rendering in transit routing --- map/transit/transit_display.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp index 14e29e7e49..bcb376ec6b 100644 --- a/map/transit/transit_display.cpp +++ b/map/transit/transit_display.cpp @@ -384,6 +384,7 @@ bool TransitRouteDisplay::ProcessSubroute(vector const & segments, auto gateMarkInfo = TransitMarkInfo(); gateMarkInfo.m_point = pendingEntrance ? subroute.m_polyline.Back() : s.GetJunction().GetPoint(); gateMarkInfo.m_type = TransitMarkInfo::Type::Gate; + gateMarkInfo.m_symbolName = "zero-icon"; if (gate.m_featureId != transit::kInvalidFeatureId) { auto const fid = FeatureID(mwmId, gate.m_featureId); @@ -397,9 +398,10 @@ bool TransitRouteDisplay::ProcessSubroute(vector const & segments, } gateMarkInfo.m_featureId = fid; - gateMarkInfo.m_symbolName = symbolName; + if (!symbolName.empty()) + gateMarkInfo.m_symbolName = symbolName; auto const title = m_getStringsBundleFn().GetString(pendingEntrance ? "core_entrance" : "core_exit"); - gateMarkInfo.m_titles.push_back(TransitTitle(title, df::GetTransitTextColorName("default"))); + gateMarkInfo.m_titles.emplace_back(title, df::GetTransitTextColorName("default")); } m_transitMarks.push_back(gateMarkInfo);