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

Fixes issue #62. Initial "O m" instruction won't be shown anymore.

Browse Source
This commit is contained in:
DennisOSRM
2012-02-08 14:58:58 +01:00
parent 0dc77b056a
commit cc91ee1c52
3 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataStructures/TurnInstructions.h
+3 -43
View File
@@ -40,8 +40,9 @@ struct TurnInstructionsClass {
const static short EnterRoundAbout = 11;
const static short LeaveRoundAbout = 12;
const static short StayOnRoundAbout = 13;
const static short StartAtEndOfStreet = 14;
std::string TurnStrings[14];
std::string TurnStrings[15];
std::string Ordinals[11];
//This is a hack until c++0x is available enough to use initializer lists.
@@ -60,6 +61,7 @@ struct TurnInstructionsClass {
TurnStrings[11] = "Enter round-about";
TurnStrings[12] = "Leave round-about";
TurnStrings[13] = "Stay on round-about";
TurnStrings[14] = "Start";
Ordinals[0] = "zeroth";
Ordinals[1] = "first";
@@ -105,48 +107,6 @@ struct TurnInstructionsClass {
return true;
}
// static inline void getDirectionOfInstruction(double angle, DirectionOfInstruction & dirInst) {
// if(angle >= 23 && angle < 67) {
// dirInst.direction = "southeast";
// dirInst.shortDirection = "SE";
// return;
// }
// if(angle >= 67 && angle < 113) {
// dirInst.direction = "south";
// dirInst.shortDirection = "S";
// return;
// }
// if(angle >= 113 && angle < 158) {
// dirInst.direction = "southwest";
// dirInst.shortDirection = "SW";
// return;
// }
// if(angle >= 158 && angle < 202) {
// dirInst.direction = "west";
// dirInst.shortDirection = "W";
// return;
// }
// if(angle >= 202 && angle < 248) {
// dirInst.direction = "northwest";
// dirInst.shortDirection = "NW";
// return;
// }
// if(angle >= 248 && angle < 292) {
// dirInst.direction = "north";
// dirInst.shortDirection = "N";
// return;
// }
// if(angle >= 292 && angle < 336) {
// dirInst.direction = "northeast";
// dirInst.shortDirection = "NE";
// return;
// }
// dirInst.direction = "East";
// dirInst.shortDirection = "E";
// return;
// }
//
};
static TurnInstructionsClass TurnInstructions;