From 7837cd61df6a24faf7ecd38b9a6083ce6e59d549 Mon Sep 17 00:00:00 2001 From: Huyen Chau Nguyen Date: Wed, 25 Apr 2018 16:37:37 -0400 Subject: [PATCH] clang format --- src/util/coordinate_calculation.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/util/coordinate_calculation.cpp b/src/util/coordinate_calculation.cpp index 72b59ef28..388d41ef8 100644 --- a/src/util/coordinate_calculation.cpp +++ b/src/util/coordinate_calculation.cpp @@ -22,19 +22,26 @@ namespace coordinate_calculation namespace { -class CheapRulerContainer { -public: +class CheapRulerContainer +{ + public: CheapRulerContainer(const int number_of_rulers) - : cheap_ruler_cache(number_of_rulers, mapbox::cheap_ruler::CheapRuler(0)), step(90.0 / number_of_rulers) { - for (int n = 0; n < number_of_rulers; n++) { - cheap_ruler_cache[n] = mapbox::cheap_ruler::CheapRuler(step * (n + 0.5), mapbox::cheap_ruler::CheapRuler::Meters); + : cheap_ruler_cache(number_of_rulers, mapbox::cheap_ruler::CheapRuler(0)), + step(90.0 / number_of_rulers) + { + for (int n = 0; n < number_of_rulers; n++) + { + cheap_ruler_cache[n] = mapbox::cheap_ruler::CheapRuler( + step * (n + 0.5), mapbox::cheap_ruler::CheapRuler::Meters); } }; - mapbox::cheap_ruler::CheapRuler& getRuler(const double lat) { - return cheap_ruler_cache[std::min((int)std::floor(abs(lat)/step), (int)cheap_ruler_cache.size() - 1)]; + mapbox::cheap_ruler::CheapRuler &getRuler(const double lat) + { + return cheap_ruler_cache[std::min((int)std::floor(abs(lat) / step), + (int)cheap_ruler_cache.size() - 1)]; }; -private: + private: std::vector cheap_ruler_cache; const double step; }; @@ -65,7 +72,7 @@ double fccApproximateDistance(const Coordinate coordinate_1, const Coordinate co const auto lat1 = static_cast(util::toFloating(coordinate_1.lat)); const auto lon2 = static_cast(util::toFloating(coordinate_2.lon)); const auto lat2 = static_cast(util::toFloating(coordinate_2.lat)); - return cheap_ruler_container.getRuler(0.5*(lat1+lat2)).distance({lon1, lat1}, {lon2, lat2}); + return cheap_ruler_container.getRuler(0.5 * (lat1 + lat2)).distance({lon1, lat1}, {lon2, lat2}); } double haversineDistance(const Coordinate coordinate_1, const Coordinate coordinate_2)