minor copy-edits to PR #946
This commit is contained in:
parent
ecfda146b2
commit
e07423f260
@ -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>
|
||||||
@ -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 {
|
||||||
|
|
||||||
@ -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
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user