From b247c20dbf54def0ff16ea126c09c6ac53528c94 Mon Sep 17 00:00:00 2001
From: DennisOSRM <luxen@kit.edu>
Date: Mon, 17 Dec 2012 12:37:10 +0100
Subject: [PATCH] Removing name substitution for now; Using Euclidean distance
 approximation

---
 Descriptors/DescriptionFactory.cpp | 55 ++++++++++++++++--------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp
index 2db1706a7..46a1d5b82 100644
--- a/Descriptors/DescriptionFactory.cpp
+++ b/Descriptors/DescriptionFactory.cpp
@@ -91,7 +91,7 @@ void DescriptionFactory::Run(const SearchEngineT &sEngine, const unsigned zoomLe
     /** starts at index 1 */
     pathDescription[0].length = 0;
     for(unsigned i = 1; i < pathDescription.size(); ++i) {
-        pathDescription[i].length = ApproximateDistance(pathDescription[i-1].location, pathDescription[i].location);
+        pathDescription[i].length = ApproximateDistanceByEuclid(pathDescription[i-1].location, pathDescription[i].location);
     }
 
     double lengthOfSegment = 0;
@@ -111,32 +111,37 @@ void DescriptionFactory::Run(const SearchEngineT &sEngine, const unsigned zoomLe
     becomes:
     10. Turn left on B 36 for 35 km
     */
-    unsigned lastTurn = 0;
-    for(unsigned i = 1; i < pathDescription.size(); ++i) {
-        string1 = sEngine.GetEscapedNameForNameID(pathDescription[i].nameID);
-        if(TurnInstructionsClass::GoStraight == pathDescription[i].turnInstruction) {
-            if(std::string::npos != string0.find(string1+";") ||
-                    std::string::npos != string0.find(";"+string1) ||
-                    std::string::npos != string0.find(string1+" ;") ||
-                    std::string::npos != string0.find("; "+string1)){
+//TODO: rework to check only end and start of string.
+//		stl string is way to expensive
+
+//    unsigned lastTurn = 0;
+//    for(unsigned i = 1; i < pathDescription.size(); ++i) {
+//        string1 = sEngine.GetEscapedNameForNameID(pathDescription[i].nameID);
+//        if(TurnInstructionsClass::GoStraight == pathDescription[i].turnInstruction) {
+//            if(std::string::npos != string0.find(string1+";")
+//            		|| std::string::npos != string0.find(";"+string1)
+//            		|| std::string::npos != string0.find(string1+" ;")
+//                    || std::string::npos != string0.find("; "+string1)
+//                    ){
 //                INFO("->next correct: " << string0 << " contains " << string1);
-                for(; lastTurn != i; ++lastTurn)
-                    pathDescription[lastTurn].nameID = pathDescription[i].nameID;
-                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
-            } else if(std::string::npos != string1.find(string0+";") ||
-                    std::string::npos != string1.find(";"+string0) ||
-                    std::string::npos != string1.find(string0+" ;")||
-                    std::string::npos != string1.find("; "+string0)) {
+//                for(; lastTurn != i; ++lastTurn)
+//                    pathDescription[lastTurn].nameID = pathDescription[i].nameID;
+//                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
+//            } else if(std::string::npos != string1.find(string0+";")
+//            		|| std::string::npos != string1.find(";"+string0)
+//                    || std::string::npos != string1.find(string0+" ;")
+//                    || std::string::npos != string1.find("; "+string0)
+//                    ){
 //                INFO("->prev correct: " << string1 << " contains " << string0);
-                pathDescription[i].nameID = pathDescription[i-1].nameID;
-                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
-            }
-        }
-        if (TurnInstructionsClass::NoTurn != pathDescription[i].turnInstruction) {
-            lastTurn = i;
-        }
-        string0 = string1;
-    }
+//                pathDescription[i].nameID = pathDescription[i-1].nameID;
+//                pathDescription[i].turnInstruction = TurnInstructionsClass::NoTurn;
+//            }
+//        }
+//        if (TurnInstructionsClass::NoTurn != pathDescription[i].turnInstruction) {
+//            lastTurn = i;
+//        }
+//        string0 = string1;
+//    }
 
 
     for(unsigned i = 1; i < pathDescription.size(); ++i) {