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

Fixing broken merge

Browse Source
This commit is contained in:
DennisOSRM 2012-04-16 17:41:54 +02:00
parent b3570f57ee
commit 7e8de26657
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Descriptors/JSONDescriptor.h
View File

@ -85,7 +85,7 @@ public:
unsigned prefixSumOfNecessarySegments = 0; unsigned prefixSumOfNecessarySegments = 0;
roundAbout.leaveAtExit = 0; roundAbout.leaveAtExit = 0;
roundAbout.nameID = 0; roundAbout.nameID = 0;
std::string tmpDist, tmpLength, tmpDuration, tmpBearing; std::string tmpDist, tmpLength, tmpDuration, tmpBearing, tmpInstruction;
//Fetch data from Factory and generate a string from it. //Fetch data from Factory and generate a string from it.
BOOST_FOREACH(const SegmentInformation & segment, descriptionFactory.pathDescription) { BOOST_FOREACH(const SegmentInformation & segment, descriptionFactory.pathDescription) {
short currentInstruction = segment.turnInstruction & TurnInstructions.InverseAccessRestrictionFlag; short currentInstruction = segment.turnInstruction & TurnInstructions.InverseAccessRestrictionFlag;
@ -100,13 +100,16 @@ public:
} }
reply.content += "[\""; reply.content += "[\"";
if(TurnInstructions.LeaveRoundAbout == currentInstruction) { if(TurnInstructions.LeaveRoundAbout == currentInstruction) {
reply.content += TurnInstructions.TurnStrings[TurnInstructions.EnterRoundAbout]; intToString(TurnInstructions.EnterRoundAbout, tmpInstruction);
reply.content += tmpInstruction;
reply.content += " and leave at "; reply.content += " and leave at ";
reply.content += TurnInstructions.Ordinals[std::min(11,roundAbout.leaveAtExit+1)]; intToString(roundAbout.leaveAtExit+1, tmpInstruction);
reply.content += tmpInstruction;
reply.content += " exit"; reply.content += " exit";
roundAbout.leaveAtExit = 0; roundAbout.leaveAtExit = 0;
} else { } else {
reply.content += TurnInstructions.TurnStrings[currentInstruction]; intToString(currentInstruction, tmpInstruction);
reply.content += tmpInstruction;
} }
reply.content += "\",\""; reply.content += "\",\"";
reply.content += sEngine.GetEscapedNameForNameID(segment.nameID); reply.content += sEngine.GetEscapedNameForNameID(segment.nameID);
@ -137,7 +140,8 @@ public:
} }
if(durationOfTrip != INT_MAX) { if(durationOfTrip != INT_MAX) {
reply.content += ",[\""; reply.content += ",[\"";
reply.content += TurnInstructions.TurnStrings[TurnInstructions.ReachedYourDestination]; intToString(TurnInstructions.ReachedYourDestination, tmpInstruction);
reply.content += tmpInstruction;
reply.content += "\",\""; reply.content += "\",\"";
reply.content += "\","; reply.content += "\",";
reply.content += "0"; reply.content += "0";