From 5236fb8c0ec558dbd74ef8856a22f4ae04763d8f Mon Sep 17 00:00:00 2001
From: DennisOSRM <luxen@kit.edu>
Date: Thu, 1 Dec 2011 14:48:06 +0100
Subject: [PATCH] Removed superflous member that saves about 10 percent of RAM

---
 Contractor/ContractionCleanup.h     | 5 ++---
 Contractor/Contractor.h             | 2 +-
 DataStructures/ExtractorCallBacks.h | 2 +-
 DataStructures/SearchEngine.h       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Contractor/ContractionCleanup.h b/Contractor/ContractionCleanup.h
index 2486a8e40..bc9f9c4e4 100644
--- a/Contractor/ContractionCleanup.h
+++ b/Contractor/ContractionCleanup.h
@@ -66,8 +66,7 @@ public:
         NodeID target;
         struct EdgeData {
             NodeID via;
-            unsigned nameID1;
-            unsigned nameID2;
+            unsigned nameID;
             int distance;
             bool shortcut;
             bool forward;
@@ -91,7 +90,7 @@ public:
         bool operator== ( const Edge& right ) const {
             return ( source == right.source && target == right.target && data.distance == right.data.distance &&
                     data.shortcut == right.data.shortcut && data.forward == right.data.forward && data.backward == right.data.backward
-                    && data.via == right.data.via && data.nameID1 == right.data.nameID1 && data.nameID2 == right.data.nameID2
+                    && data.via == right.data.via && data.nameID == right.data.nameID
                     );
         }
     };
diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h
index 9daa36865..7d40e29ff 100644
--- a/Contractor/Contractor.h
+++ b/Contractor/Contractor.h
@@ -304,7 +304,7 @@ public:
                 newEdge.data.distance = data.distance;
                 newEdge.data.shortcut = data.shortcut;
                 newEdge.data.via = data.via;
-                newEdge.data.nameID1 = data.nameID;
+                newEdge.data.nameID = data.nameID;
                 newEdge.data.turnInstruction = data.turnInstruction;
                 newEdge.data.forward = data.forward;
                 newEdge.data.backward = data.backward;
diff --git a/DataStructures/ExtractorCallBacks.h b/DataStructures/ExtractorCallBacks.h
index 464a11dc0..6d2c5442b 100644
--- a/DataStructures/ExtractorCallBacks.h
+++ b/DataStructures/ExtractorCallBacks.h
@@ -164,7 +164,7 @@ public:
             w.type = 1;
 
             //Get the unique identifier for the street name
-            StringMap::const_iterator strit = stringMap->find(w.name);
+            const StringMap::const_iterator strit = stringMap->find(w.name);
             if(strit == stringMap->end()) {
                 w.nameID = externalMemory->nameVector.size();
                 externalMemory->nameVector.push_back(w.name);
diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h
index 26da8fc28..c26eff91d 100644
--- a/DataStructures/SearchEngine.h
+++ b/DataStructures/SearchEngine.h
@@ -256,7 +256,7 @@ private:
             return false;
         } else {
             assert(!ed.shortcut);
-            path.push_back(_PathData(ed.via, ed.nameID1, ed.turnInstruction, ed.distance) );
+            path.push_back(_PathData(ed.via, ed.nameID, ed.turnInstruction, ed.distance) );
             return true;
         }
     }