Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

clang format

Browse Source
This commit is contained in:
Huyen Chau Nguyen 2018-04-25 16:37:37 -04:00 committed by Patrick Niklaus
parent b573485c31
commit 7837cd61df
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/util/coordinate_calculation.cpp
View File

@ -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<mapbox::cheap_ruler::CheapRuler> cheap_ruler_cache;
const double step;
};
@ -65,7 +72,7 @@ double fccApproximateDistance(const Coordinate coordinate_1, const Coordinate co
const auto lat1 = static_cast<double>(util::toFloating(coordinate_1.lat));
const auto lon2 = static_cast<double>(util::toFloating(coordinate_2.lon));
const auto lat2 = static_cast<double>(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)