From 4c0a54f95fc75ff64055963ab1c18bfa1ab8e4dc Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Thu, 12 Apr 2012 19:52:18 +0200 Subject: [PATCH] Removing strings of the turn instructions --- DataStructures/TurnInstructions.h | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/DataStructures/TurnInstructions.h b/DataStructures/TurnInstructions.h index 7feca9e7b..b805a0317 100644 --- a/DataStructures/TurnInstructions.h +++ b/DataStructures/TurnInstructions.h @@ -48,41 +48,41 @@ struct TurnInstructionsClass { const static int AccessRestrictionPenaly = 1 << 15; //unrelated to the bit set in the restriction flag - std::string TurnStrings[16]; - std::string Ordinals[12]; +// std::string TurnStrings[16]; +// std::string Ordinals[12]; //This is a hack until c++0x is available enough to use initializer lists. - TurnInstructionsClass(){ - TurnStrings [0] = ""; - TurnStrings [1] = "Continue"; - TurnStrings [2] = "Turn slight right"; - TurnStrings [3] = "Turn right"; - TurnStrings [4] = "Turn sharp right"; - TurnStrings [5] = "U-Turn"; - TurnStrings [6] = "Turn sharp left"; - TurnStrings [7] = "Turn left"; - TurnStrings [8] = "Turn slight left"; - TurnStrings [9] = "Reach via point"; - TurnStrings[10] = "Head"; - TurnStrings[11] = "Enter roundabout"; - TurnStrings[12] = "Leave roundabout"; - TurnStrings[13] = "Stay on roundabout"; - TurnStrings[14] = "Start"; - TurnStrings[15] = "You have reached your destination"; - - Ordinals[0] = "zeroth"; - Ordinals[1] = "first"; - Ordinals[2] = "second"; - Ordinals[3] = "third"; - Ordinals[4] = "fourth"; - Ordinals[5] = "fifth"; - Ordinals[6] = "sixth"; - Ordinals[7] = "seventh"; - Ordinals[8] = "eighth"; - Ordinals[9] = "nineth"; - Ordinals[10] = "tenth"; - Ordinals[11] = "one of the too many"; - }; +// TurnInstructionsClass(){ +// TurnStrings [0] = ""; +// TurnStrings [1] = "Continue"; +// TurnStrings [2] = "Turn slight right"; +// TurnStrings [3] = "Turn right"; +// TurnStrings [4] = "Turn sharp right"; +// TurnStrings [5] = "U-Turn"; +// TurnStrings [6] = "Turn sharp left"; +// TurnStrings [7] = "Turn left"; +// TurnStrings [8] = "Turn slight left"; +// TurnStrings [9] = "Reach via point"; +// TurnStrings[10] = "Head"; +// TurnStrings[11] = "Enter roundabout"; +// TurnStrings[12] = "Leave roundabout"; +// TurnStrings[13] = "Stay on roundabout"; +// TurnStrings[14] = "Start"; +// TurnStrings[15] = "You have reached your destination"; +// +// Ordinals[0] = "zeroth"; +// Ordinals[1] = "first"; +// Ordinals[2] = "second"; +// Ordinals[3] = "third"; +// Ordinals[4] = "fourth"; +// Ordinals[5] = "fifth"; +// Ordinals[6] = "sixth"; +// Ordinals[7] = "seventh"; +// Ordinals[8] = "eighth"; +// Ordinals[9] = "nineth"; +// Ordinals[10] = "tenth"; +// Ordinals[11] = "one of the too many"; +// }; static inline double GetTurnDirectionOfInstruction( const double angle ) { if(angle >= 23 && angle < 67) {