Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'drape_frontend/gui/ruler_helper.cpp')
-rw-r--r--drape_frontend/gui/ruler_helper.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/drape_frontend/gui/ruler_helper.cpp b/drape_frontend/gui/ruler_helper.cpp
index f0fcff1510..c198f38021 100644
--- a/drape_frontend/gui/ruler_helper.cpp
+++ b/drape_frontend/gui/ruler_helper.cpp
@@ -72,7 +72,7 @@ UnitValue g_arrYards[] = {
{ "500 mi", 500 * 1760 }
};
-UnitValue g_arrMetres[] = {
+UnitValue g_arrMeters[] = {
{ "1 m", 1 },
{ "2 m", 2 },
{ "5 m", 5 },
@@ -114,10 +114,10 @@ void RulerHelper::Update(ScreenBase const & screen)
m2::PointD pt1 = screen.PtoG(pivot);
m2::PointD pt0 = screen.PtoG(pivot - m2::PointD(minPxWidth, 0));
- double const distanceInMetres = MercatorBounds::DistanceOnEarth(pt0, pt1);
+ double const distanceInMeters = MercatorBounds::DistanceOnEarth(pt0, pt1);
// convert metres to units for calculating m_metresDiff.
- double metersDiff = CalcMetresDiff(distanceInMetres);
+ double metersDiff = CalcMetersDiff(distanceInMeters);
bool const higherThanMax = metersDiff > kMaxMetersWidth;
bool const lessThanMin = metersDiff < kMinMetersWidth;
@@ -205,7 +205,7 @@ void RulerHelper::GetTextInitInfo(string & alphabet, uint32_t & size) const
};
std::for_each(std::begin(g_arrFeets), std::end(g_arrFeets), functor);
- std::for_each(std::begin(g_arrMetres), std::end(g_arrMetres), functor);
+ std::for_each(std::begin(g_arrMeters), std::end(g_arrMeters), functor);
std::for_each(std::begin(g_arrYards), std::end(g_arrYards), functor);
std::for_each(begin(symbols), end(symbols), [&alphabet](char c)
@@ -217,10 +217,10 @@ void RulerHelper::GetTextInitInfo(string & alphabet, uint32_t & size) const
size = static_cast<uint32_t>(result) + 2; // add 2 char for symbols "< " and "> ".
}
-double RulerHelper::CalcMetresDiff(double value)
+double RulerHelper::CalcMetersDiff(double value)
{
- UnitValue * arrU = g_arrMetres;
- int count = ARRAY_SIZE(g_arrMetres);
+ UnitValue * arrU = g_arrMeters;
+ int count = ARRAY_SIZE(g_arrMeters);
auto conversionFn = &Identity;