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

Fixed algorithm to choose resource postfix to more stable

Browse source
This commit is contained in:
Roman Kuznetsov 2015-09-28 19:01:40 +03:00 • committed by r.kuznetsov
parent 353eae1cde
commit 34d8e5dafa
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drape_frontend/visual_params.cpp
View file

@ -21,21 +21,6 @@ static VisualParams g_VizParams;
typedef pair<string, double> visual_scale_t;
struct VisualScaleFinder
{
VisualScaleFinder(double vs)
: m_vs(vs)
{
}
bool operator()(visual_scale_t const & node)
{
return my::AlmostEqualULPs(node.second, m_vs);
}
double m_vs;
};
} // namespace
#ifdef DEBUG
@ -83,9 +68,21 @@ string const & VisualParams::GetResourcePostfix(double visualScale, bool isYotaD
if (isYotaDevice)
return specifixPostfixes[0];
visual_scale_t * finded = find_if(postfixes, postfixes + ARRAY_SIZE(postfixes), VisualScaleFinder(visualScale));
ASSERT(finded < postfixes + ARRAY_SIZE(postfixes), ());
return finded->first;
// Looking for the nearest available scale.
int postfixIndex = -1;
double minValue = numeric_limits<float>::max();
for (int i = 0; i < ARRAY_SIZE(postfixes); i++)
{
double val = fabs(postfixes[i].second - visualScale);
if (val < minValue)
{
minValue = val;
postfixIndex = i;
}
}
ASSERT_GREATER_OR_EQUAL(postfixIndex, 0, ());
return postfixes[postfixIndex].first;
}
string const & VisualParams::GetResourcePostfix() const