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

Return back INITIAL_LEVEL for scales - current styles are optimized for this increment.

Browse source
This commit is contained in:
vng 2013-09-14 18:03:40 +03:00 • committed by Alex Zolotarev
parent 2b2be34748
commit 0eac569594
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
indexer/scales.cpp
View file

@ -8,10 +8,11 @@
namespace scales
{
static const int INITIAL_LEVEL = 1;
double GetScaleLevelD(double ratio)
{
double const level = min(static_cast<double>(GetUpperScale()), log(ratio) / log(2.0));
double const level = min(static_cast<double>(GetUpperScale()), log(ratio) / log(2.0) + INITIAL_LEVEL);
return (level < 0.0 ? 0.0 : level);
}
@ -37,7 +38,9 @@ namespace scales
double GetRationForLevel(double level)
{
return max(0.0, pow(2.0, level));
if (level < INITIAL_LEVEL)
level = INITIAL_LEVEL;
return pow(2.0, level - INITIAL_LEVEL);
}
m2::RectD GetRectForLevel(double level, m2::PointD const & center)