diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2019-05-06 15:52:58 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2019-05-06 15:55:02 +0300 |
commit | 7e558ece3e3c210f0d48e34325aae62c460b536a (patch) | |
tree | 855ac01e3d239b582066c9e609d041fd4075a971 | |
parent | 38917bac0ebfe4683c624a5bda513cb68c3ae21e (diff) |
[vulkan] Fixed gate icons rendering in transit routingandroid-google-915
-rw-r--r-- | map/transit/transit_display.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp index 5b64b8e1cd..085f320e14 100644 --- a/map/transit/transit_display.cpp +++ b/map/transit/transit_display.cpp @@ -384,6 +384,7 @@ bool TransitRouteDisplay::ProcessSubroute(vector<RouteSegment> 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); @@ -395,13 +396,11 @@ bool TransitRouteDisplay::ProcessSubroute(vector<RouteSegment> const & segments, { symbolName = symbolName.substr(0, symbolName.rfind('-')); } - if (symbolName.empty()) - symbolName = "subway"; - 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); |