From 7d4d51ed1fb6e104d260340877d8d158b7725dc9 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Fri, 11 May 2018 19:08:02 +0300 Subject: [PATCH] Removed usage of large icons --- map/routing_manager.cpp | 3 +-- map/transit/transit_display.cpp | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index 79b2d202a6..d41acd9c04 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -955,12 +955,11 @@ void RoutingManager::SetDrapeEngine(ref_ptr engine, bool is3dAl } vector symbols; - symbols.reserve(kTransitSymbols.size() * 3); + symbols.reserve(kTransitSymbols.size() * 2); for (auto const & typePair : kTransitSymbols) { symbols.push_back(typePair.second + "-s"); symbols.push_back(typePair.second + "-m"); - symbols.push_back(typePair.second + "-l"); } m_drapeEngine.SafeCall(&df::DrapeEngine::RequestSymbolsSize, symbols, [this, is3dAllowed](map && sizes) diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp index d706e621f6..1609562aa2 100644 --- a/map/transit/transit_display.cpp +++ b/map/transit/transit_display.cpp @@ -23,7 +23,6 @@ const float kGateBgScale = 1.2f; const int kSmallIconZoom = 1; const int kMediumIconZoom = 10; -const int kLargeIconZoom = 15; const int kMinStopTitleZoom = 13; @@ -505,7 +504,6 @@ void TransitRouteDisplay::CreateTransitMarks() df::UserPointMark::SymbolNameZoomInfo symbolNames; symbolNames[kSmallIconZoom] = mark.m_symbolName + "-s"; symbolNames[kMediumIconZoom] = mark.m_symbolName + "-m"; - symbolNames[kLargeIconZoom] = mark.m_symbolName + "-l"; transitMark->SetSymbolNames(symbolNames); transitMark->SetPriority(UserMark::Priority::TransitGate); } @@ -566,7 +564,6 @@ void TransitRouteDisplay::CreateTransitMarks() df::UserPointMark::SymbolNameZoomInfo symbolNames; symbolNames[kSmallIconZoom] = mark.m_symbolName + "-s"; symbolNames[kMediumIconZoom] = mark.m_symbolName + "-m"; - symbolNames[kLargeIconZoom] = mark.m_symbolName + "-l"; transitMark->SetSymbolNames(symbolNames); df::UserPointMark::ColoredSymbolZoomInfo coloredSymbol; @@ -581,10 +578,6 @@ void TransitRouteDisplay::CreateTransitMarks() params.m_radiusInPixels = max(sz.x, sz.y) * kGateBgScale * 0.5f; coloredSymbol[kMediumIconZoom] = params; - sz = m_symbolSizes.at(symbolNames[kLargeIconZoom]); - params.m_radiusInPixels = max(sz.x, sz.y) * kGateBgScale * 0.5f; - coloredSymbol[kLargeIconZoom] = params; - transitMark->SetColoredSymbols(coloredSymbol); transitMark->SetPriority(UserMark::Priority::TransitKeyStop); }