diff --git a/indexer/scales.cpp b/indexer/scales.cpp index f8d1c4e77a..ea483a94df 100644 --- a/indexer/scales.cpp +++ b/indexer/scales.cpp @@ -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(GetUpperScale()), log(ratio) / log(2.0) + initial_level); + double const level = min(static_cast(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) diff --git a/map/bookmark_balloon.cpp b/map/bookmark_balloon.cpp index c97f5503a6..46c67207c0 100644 --- a/map/bookmark_balloon.cpp +++ b/map/bookmark_balloon.cpp @@ -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) { } diff --git a/map/ruler.hpp b/map/ruler.hpp index 5d15e7e579..4e26ae4b9e 100644 --- a/map/ruler.hpp +++ b/map/ruler.hpp @@ -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;