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

minor copy-edits to PR #946

Browse Source
This commit is contained in:
Dennis Luxen 2014-03-12 13:56:25 +01:00
parent ecfda146b2
commit e07423f260
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DataStructures/EdgeBasedNode.h
View File

@ -6,7 +6,6 @@
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include "../Util/MercatorUtil.h" #include "../Util/MercatorUtil.h"
#include "../Util/SimpleLogger.h"
#include "../typedefs.h" #include "../typedefs.h"
#include <osrm/Coordinate.h> #include <osrm/Coordinate.h>
@ -36,7 +35,7 @@ struct EdgeBasedNode {
FixedPointCoordinate & nearest_location, FixedPointCoordinate & nearest_location,
double & ratio, double & ratio,
double precision = COORDINATE_PRECISION double precision = COORDINATE_PRECISION
) const { ) const {
BOOST_ASSERT( query_location.isValid() ); BOOST_ASSERT( query_location.isValid() );
const double epsilon = 1.0/precision; const double epsilon = 1.0/precision;
@ -51,7 +50,7 @@ struct EdgeBasedNode {
// r : query location // r : query location
const Point r(lat2y(query_location.lat/COORDINATE_PRECISION), const Point r(lat2y(query_location.lat/COORDINATE_PRECISION),
query_location.lon/COORDINATE_PRECISION); query_location.lon/COORDINATE_PRECISION);
const Point foot = ComputePerpendicularFoot(p, q, r, epsilon); const Point foot = ComputePerpendicularFoot(p, q, r, epsilon);
ratio = ComputeRatio(p, q, foot, epsilon); ratio = ComputeRatio(p, q, foot, epsilon);
@ -103,7 +102,6 @@ private:
typedef std::pair<double,double> Point; typedef std::pair<double,double> Point;
// Compute the perpendicular foot of point r on the line defined by p and q. // Compute the perpendicular foot of point r on the line defined by p and q.
Point ComputePerpendicularFoot(const Point &p, const Point &q, const Point &r, double epsilon) const { Point ComputePerpendicularFoot(const Point &p, const Point &q, const Point &r, double epsilon) const {
@ -131,7 +129,7 @@ private:
double ComputeRatio(const Point & p, const Point & q, const Point & r, double epsilon) const { double ComputeRatio(const Point & p, const Point & q, const Point & r, double epsilon) const {
const bool is_parallel_to_x_axis = std::abs(q.second-p.second) < epsilon; const bool is_parallel_to_x_axis = std::abs(q.second-p.second) < epsilon;
const bool is_parallel_to_y_axis = std::abs(q.first-p.first) < epsilon; const bool is_parallel_to_y_axis = std::abs(q.first -p.first ) < epsilon;
double ratio; double ratio;
@ -164,12 +162,13 @@ private:
return FixedPointCoordinate(lat1, lon1); return FixedPointCoordinate(lat1, lon1);
} else if( lambda >= 1.0 ) { } else if( lambda >= 1.0 ) {
return FixedPointCoordinate(lat2, lon2); return FixedPointCoordinate(lat2, lon2);
} else {
// r lies between p and q
return FixedPointCoordinate(y2lat(r.first)*COORDINATE_PRECISION,
r.second*COORDINATE_PRECISION);
} }
// r lies between p and q
return FixedPointCoordinate(
y2lat(r.first)*COORDINATE_PRECISION,
r.second*COORDINATE_PRECISION
);
} }
}; };