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

Merge branch 'master' of

Browse Source 
https://DennisOSRM@github.com/DennisOSRM/Project-OSRM.git
This commit is contained in:
DennisOSRM
2012-02-29 14:30:19 +01:00
parent 39be1ec116 c3bab284ba
commit f332f39ea6
7 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Descriptors/DescriptionFactory.cpp
+4 -2
View File
@@ -100,14 +100,16 @@ void DescriptionFactory::Run(const SearchEngineT &sEngine, const unsigned zoomLe
if(TurnInstructionsClass::GoStraight == pathDescription[i].turnInstruction) {
if(std::string::npos != string0.find(string1+";") ||
std::string::npos != string0.find(";"+string1) ||
std::string::npos != string0.find(string1+" ;")) {
std::string::npos != string0.find(string1+" ;") ||
std::string::npos != string0.find("; "+string1)){
// INFO("->next correct: " << string0 << " contains " << string1);
for(; lastTurn != i; ++lastTurn)
pathDescription[lastTurn].nameID = pathDescription[i].nameID;
pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
} else if(std::string::npos != string1.find(string0+";") ||
std::string::npos != string1.find(";"+string0) ||
std::string::npos != string1.find(string0+" ;")) {
std::string::npos != string1.find(string0+" ;")||
std::string::npos != string1.find("; "+string0)) {
// INFO("->prev correct: " << string1 << " contains " << string0);
pathDescription[i].nameID = pathDescription[i-1].nameID;
pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;