pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Removed usage of large icons

Browse source
This commit is contained in:
Roman Kuznetsov 2018-05-11 19:08:02 +03:00 • committed by Aleksandr Zatsepin
parent a7325b688c
commit 7d4d51ed1f
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/routing_manager.cpp
View file

@ -955,12 +955,11 @@ void RoutingManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine, bool is3dAl
}
vector<string> 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<string, m2::PointF> && sizes)

7
map/transit/transit_display.cpp
View file

@ -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);
}