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

Define compile-time constants for coordinate calculation only once

Browse Source 
Closes #1327.
This commit is contained in:
Daniel J. Hofmann
2016-01-12 15:41:30 +01:00
committed by Patrick Niklaus
parent f46706843b
commit 466251287f
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/coordinate_calculation.cpp
+2 -11
View File
@@ -15,15 +15,6 @@ namespace osrm
{
namespace util
{
namespace
{
constexpr static const double RAD = 0.017453292519943295769236907684886;
// earth radius varies between 6,356.750-6,378.135 km (3,949.901-3,963.189mi)
// The IUGG value for the equatorial radius is 6378.137 km (3963.19 miles)
constexpr static const double earth_radius = 6372797.560856;
}
namespace coordinate_calculation
{
@@ -49,7 +40,7 @@ double haversineDistance(const int lat1, const int lon1, const int lat2, const i
const double aharv = std::pow(std::sin(dlat / 2.0), 2.0) +
std::cos(dlat1) * std::cos(dlat2) * std::pow(std::sin(dlong / 2.), 2);
const double charv = 2. * std::atan2(std::sqrt(aharv), std::sqrt(1.0 - aharv));
return earth_radius * charv;
return EARTH_RADIUS * charv;
}
double haversineDistance(const FixedPointCoordinate &coordinate_1,
@@ -80,7 +71,7 @@ double greatCircleDistance(const int lat1, const int lon1, const int lat2, const
const double x_value = (float_lon2 - float_lon1) * std::cos((float_lat1 + float_lat2) / 2.0);
const double y_value = float_lat2 - float_lat1;
return std::hypot(x_value, y_value) * earth_radius;
return std::hypot(x_value, y_value) * EARTH_RADIUS;
}
double perpendicularDistance(const FixedPointCoordinate &source_coordinate,