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

Code Styling & Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2013-06-04 22:27:27 +03:00 • committed by Alex Zolotarev
parent 8dcb683d18
commit 06b1f19ca9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
indexer/scales.cpp
View file

@ -10,7 +10,7 @@ namespace scales
{
/// @name This parameters should be tuned.
//@{
static const int initial_level = 1;
static const int INITIAL_LEVEL = 1;
double GetM2PFactor(int level)
{
@ -26,7 +26,7 @@ namespace scales
double GetScaleLevelD(double ratio)
{
double const level = min(static_cast<double>(GetUpperScale()), log(ratio) / log(2.0) + initial_level);
double const level = min(static_cast<double>(GetUpperScale()), log(ratio) / log(2.0) + INITIAL_LEVEL);
return (level < 0.0 ? 0.0 : level);
}
@ -52,8 +52,9 @@ namespace scales
double GetRationForLevel(double level)
{
if (level < initial_level) level = initial_level;
return pow(2.0, level - initial_level);
if (level < INITIAL_LEVEL)
level = INITIAL_LEVEL;
return pow(2.0, level - INITIAL_LEVEL);
}
m2::RectD GetRectForLevel(double level, m2::PointD const & center, double X2YRatio)

4
map/bookmark_balloon.cpp
View file

@ -89,8 +89,8 @@ private:
BookmarkBalloon::BookmarkBalloon(Params const & p)
: Balloon(p),
m_isPositionChecked(true),
m_framework(p.m_framework)
m_framework(p.m_framework),
m_isPositionChecked(true)
{
}

1
map/ruler.hpp
View file

@ -32,7 +32,6 @@ private:
/// @todo Remove this variables. All this stuff are constants
/// (get values from Framework constructor)
unsigned m_minPxWidth;
unsigned m_maxPxWidth;
double m_minMetersWidth;
double m_maxMetersWidth;