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:
authorvng <viktor.govako@gmail.com>2015-12-22 15:32:26 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:03:16 +0300
commitb15b113b2c24c5eaa4ec4cabfa8981020dbd661a (patch)
tree61de46525d847e07c86c17e1a72062a4fab94bfd /indexer/feature_algo.cpp
parent2fe8fee598e31e2a456b09208b2d53eeb69df0c9 (diff)
Review fixes.
Diffstat (limited to 'indexer/feature_algo.cpp')
-rw-r--r--indexer/feature_algo.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indexer/feature_algo.cpp b/indexer/feature_algo.cpp
index fe501c03a6..3bb975d743 100644
--- a/indexer/feature_algo.cpp
+++ b/indexer/feature_algo.cpp
@@ -132,7 +132,7 @@ m2::PointD GetCenter(FeatureType const & f)
double GetMinDistance(FeatureType const & ft, m2::PointD const & pt, int scale)
{
double res = numeric_limits<double>::max();
- auto distanceFn = [&] (m2::PointD const & p)
+ auto updateDistanceFn = [&] (m2::PointD const & p)
{
double const d = MercatorBounds::DistanceOnEarth(p, pt);
if (d < res)
@@ -144,20 +144,20 @@ double GetMinDistance(FeatureType const & ft, m2::PointD const & pt, int scale)
switch (type)
{
case GEOM_POINT:
- distanceFn(ft.GetCenter());
+ updateDistanceFn(ft.GetCenter());
break;
case GEOM_LINE:
- ft.ForEachPoint(distanceFn, scale);
+ ft.ForEachPoint(updateDistanceFn, scale);
break;
default:
ASSERT_EQUAL(type, GEOM_AREA, ());
ft.ForEachTriangle([&] (m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
{
- distanceFn(p1);
- distanceFn(p2);
- distanceFn(p3);
+ updateDistanceFn(p1);
+ updateDistanceFn(p2);
+ updateDistanceFn(p3);
}, scale);
break;
}