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

Fixing corner case on lookup of nearest neighbor

Browse Source
This commit is contained in:
DennisOSRM 2012-10-02 12:11:39 +02:00
parent b39507efc8
commit 1bef65bf2c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DataStructures/NNGrid.h
View File

@ -150,13 +150,16 @@ public:
ramFile.close(); ramFile.close();
} }
#endif #endif
inline bool CoordinatesAreEquivalent(const _Coordinate & a, const _Coordinate & b, const _Coordinate & c, const _Coordinate & d) const {
return (a == b && c == d) || (a == c && b == d) || (a == d && b == c);
}
bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode, const unsigned zoomLevel) { bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode, const unsigned zoomLevel) {
bool ignoreTinyComponents = (zoomLevel <= 14); bool ignoreTinyComponents = (zoomLevel <= 14);
// INFO("ZoomLevel: " << zoomLevel << ", ignoring tinyComponentents: " << (ignoreTinyComponents ? "yes" : "no")); // INFO("ZoomLevel: " << zoomLevel << ", ignoring tinyComponentents: " << (ignoreTinyComponents ? "yes" : "no"));
// double time1 = get_timestamp(); // double time1 = get_timestamp();
bool foundNode = false; bool foundNode = false;
_Coordinate startCoord(100000*(lat2y(static_cast<double>(location.lat)/100000.)), location.lon); const _Coordinate startCoord(100000*(lat2y(static_cast<double>(location.lat)/100000.)), location.lon);
/** search for point on edge close to source */ /** search for point on edge close to source */
const unsigned fileIndex = GetFileIndexForLatLon(startCoord.lat, startCoord.lon); const unsigned fileIndex = GetFileIndexForLatLon(startCoord.lat, startCoord.lon);
std::vector<_GridEdge> candidates; std::vector<_GridEdge> candidates;
@ -167,7 +170,7 @@ public:
} }
} }
_GridEdge smallestEdge; _GridEdge smallestEdge;
_Coordinate tmp; _Coordinate tmp, edgeStartCoord, edgeEndCoord;
double dist = numeric_limits<double>::max(); double dist = numeric_limits<double>::max();
double r, tmpDist; double r, tmpDist;
@ -185,6 +188,8 @@ public:
resultNode.weight2 = INT_MAX; resultNode.weight2 = INT_MAX;
resultNode.location.lat = tmp.lat; resultNode.location.lat = tmp.lat;
resultNode.location.lon = tmp.lon; resultNode.location.lon = tmp.lon;
edgeStartCoord = candidate.startCoord;
edgeEndCoord = candidate.targetCoord;
foundNode = true; foundNode = true;
smallestEdge = candidate; smallestEdge = candidate;
//} else if(tmpDist < dist) { //} else if(tmpDist < dist) {
@ -283,7 +288,6 @@ private:
return UINT_MAX; return UINT_MAX;
} }
inline void BuildCellIndexToFileIndexMap(const unsigned ramIndex, boost::unordered_map<unsigned, unsigned >& cellMap){ inline void BuildCellIndexToFileIndexMap(const unsigned ramIndex, boost::unordered_map<unsigned, unsigned >& cellMap){
unsigned lineBase = ramIndex/1024; unsigned lineBase = ramIndex/1024;
lineBase = lineBase*32*32768; lineBase = lineBase*32*32768;
@ -301,7 +305,7 @@ private:
} }
inline bool DoubleEpsilonCompare(const double d1, const double d2) { inline bool DoubleEpsilonCompare(const double d1, const double d2) {
return (std::fabs(d1 - d2) < 0.0001); return (std::fabs(d1 - d2) < FLT_EPSILON);
} }
inline unsigned FillCell(std::vector<GridEntry>& entriesWithSameRAMIndex, const unsigned long fileOffset, boost::unordered_map< unsigned, unsigned > & cellMap ) { inline unsigned FillCell(std::vector<GridEntry>& entriesWithSameRAMIndex, const unsigned long fileOffset, boost::unordered_map< unsigned, unsigned > & cellMap ) {
@ -416,7 +420,6 @@ private:
localStream->read(static_cast<char*>( static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge)); localStream->read(static_cast<char*>( static_cast<void*>(&result[currentSizeOfResult])), lengthOfBucket*sizeof(_GridEdge));
} }
inline void GetContentsOfFileBucket(const unsigned fileIndex, std::vector<_GridEdge>& result, boost::unordered_map< unsigned, unsigned> & cellMap) { inline void GetContentsOfFileBucket(const unsigned fileIndex, std::vector<_GridEdge>& result, boost::unordered_map< unsigned, unsigned> & cellMap) {
unsigned ramIndex = GetRAMIndexFromFileIndex(fileIndex); unsigned ramIndex = GetRAMIndexFromFileIndex(fileIndex);
unsigned long startIndexInFile = ramIndexTable[ramIndex]; unsigned long startIndexInFile = ramIndexTable[ramIndex];
@ -484,12 +487,12 @@ private:
nY = (d*p - c*q)/(a*d - b*c); nY = (d*p - c*q)/(a*d - b*c);
mX = (p - nY*a)/c;// These values are actually n/m+n and m/m+n , we neednot calculate the values of m an n as we are just interested in the ratio mX = (p - nY*a)/c;// These values are actually n/m+n and m/m+n , we neednot calculate the values of m an n as we are just interested in the ratio
*r = mX; *r = mX;
if(*r<=0){ if(*r<=0.){
nearest.lat = source.lat; nearest.lat = source.lat;
nearest.lon = source.lon; nearest.lon = source.lon;
return ((b - y)*(b - y) + (a - x)*(a - x)); return ((b - y)*(b - y) + (a - x)*(a - x));
} }
else if(*r >= 1){ else if(*r >= 1.){
nearest.lat = target.lat; nearest.lat = target.lat;
nearest.lon = target.lon; nearest.lon = target.lon;
return ((d - y)*(d - y) + (c - x)*(c - x)); return ((d - y)*(d - y) + (c - x)*(c - x));