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

More roundabout magic

Browse Source
This commit is contained in:
DennisOSRM 2011-11-22 16:57:42 +01:00
parent 070050a48e
commit 885d45e9b8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -207,7 +207,6 @@ short EdgeBasedGraphFactory::AnalyzeTurn(const NodeID u, const NodeID v, const N
return TurnInstructions.NoTurn; return TurnInstructions.NoTurn;
} }
return TurnInstructions.GetTurnDirectionOfInstruction(angle); return TurnInstructions.GetTurnDirectionOfInstruction(angle);
} }

9
Descriptors/JSONDescriptor.h
View File

@ -97,6 +97,7 @@ public:
//Example: ["Turn left","High Street",200,4,10,"200m","NE",22.5] //Example: ["Turn left","High Street",200,4,10,"200m","NE",22.5]
//See also: http://developers.cloudmade.com/wiki/navengine/JSON_format //See also: http://developers.cloudmade.com/wiki/navengine/JSON_format
unsigned prefixSumOfNecessarySegments = 0; unsigned prefixSumOfNecessarySegments = 0;
unsigned leaveAtExit = 0;
std::string tmpDist, tmpLength, tmp; std::string tmpDist, tmpLength, tmp;
//Fetch data from Factory and generate a string from it. //Fetch data from Factory and generate a string from it.
BOOST_FOREACH(SegmentInformation segment, descriptionFactory.pathDescription) { BOOST_FOREACH(SegmentInformation segment, descriptionFactory.pathDescription) {
@ -105,6 +106,14 @@ public:
reply.content += ","; reply.content += ",";
reply.content += "[\""; reply.content += "[\"";
INFO("INstruction: " << segment.turnInstruction); INFO("INstruction: " << segment.turnInstruction);
if(TurnInstructions.StayOnRoundAbout == segment.turnInstruction){
INFO("Staying on roundabout");
++leaveAtExit;
}
if(TurnInstructions.LeaveRoundAbout == segment.turnInstruction) {
INFO("Exiting at exit " << leaveAtExit);
leaveAtExit = 0;
}
reply.content += TurnInstructions.TurnStrings[segment.turnInstruction]; reply.content += TurnInstructions.TurnStrings[segment.turnInstruction];
reply.content += "\",\""; reply.content += "\",\"";
reply.content += sEngine.GetEscapedNameForNameID(segment.nameID); reply.content += sEngine.GetEscapedNameForNameID(segment.nameID);