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

Destination now shows up in turn instructions

Browse Source
This commit is contained in:
DennisOSRM 2012-03-16 13:25:23 +01:00
parent 3712868831
commit 17738c3861
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataStructures/TurnInstructions.h
View File

@ -41,8 +41,9 @@ struct TurnInstructionsClass {
const static short LeaveRoundAbout = 12; const static short LeaveRoundAbout = 12;
const static short StayOnRoundAbout = 13; const static short StayOnRoundAbout = 13;
const static short StartAtEndOfStreet = 14; const static short StartAtEndOfStreet = 14;
const static short ReachedYourDestination = 15;
std::string TurnStrings[15]; std::string TurnStrings[16];
std::string Ordinals[12]; std::string Ordinals[12];
//This is a hack until c++0x is available enough to use initializer lists. //This is a hack until c++0x is available enough to use initializer lists.
@ -62,6 +63,7 @@ struct TurnInstructionsClass {
TurnStrings[12] = "Leave roundabout"; TurnStrings[12] = "Leave roundabout";
TurnStrings[13] = "Stay on roundabout"; TurnStrings[13] = "Stay on roundabout";
TurnStrings[14] = "Start"; TurnStrings[14] = "Start";
TurnStrings[15] = "You have reached your destination";
Ordinals[0] = "zeroth"; Ordinals[0] = "zeroth";
Ordinals[1] = "first"; Ordinals[1] = "first";

16
Descriptors/JSONDescriptor.h
View File

@ -147,6 +147,22 @@ public:
if(segment.necessary) if(segment.necessary)
++prefixSumOfNecessarySegments; ++prefixSumOfNecessarySegments;
} }
reply.content += ",[\"";
reply.content += TurnInstructions.TurnStrings[TurnInstructions.ReachedYourDestination];
reply.content += "\",\"";
reply.content += "\",";
reply.content += "0";
reply.content += ",";
intToString(prefixSumOfNecessarySegments-1, tmpLength);
reply.content += tmpLength;
reply.content += ",";
reply.content += "0";
reply.content += ",\"";
reply.content += "\",\"";
reply.content += Azimuth::Get(0.0);
reply.content += "\",";
reply.content += "0.0";
reply.content += "]";
} }
reply.content += "],"; reply.content += "],";
//list all viapoints so that the client may display it //list all viapoints so that the client may display it