break out OriginalEdgeData class into its own include

Server/DataStructures/InternalDataFacade.h

@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseDataFacade.h"
 
 #include "../../DataStructures/Coordinate.h"
+#include "../../DataStructures/OriginalEdgeData.h"
 #include "../../DataStructures/QueryNode.h"
 #include "../../DataStructures/QueryEdge.h"
 #include "../../DataStructures/SharedMemoryVectorWrapper.h"
@@ -154,9 +155,9 @@ private:
                 (char*)&(current_edge_data),
                 sizeof(OriginalEdgeData)
             );
-            m_via_node_list[i] = current_edge_data.viaNode;
-            m_name_ID_list[i]  = current_edge_data.nameID;
-            m_turn_instruction_list[i] = current_edge_data.turnInstruction;
+            m_via_node_list[i] = current_edge_data.via_node;
+            m_name_ID_list[i]  = current_edge_data.name_id;
+            m_turn_instruction_list[i] = current_edge_data.turn_instruction;
         }
         edges_input_stream.close();
     }

Server/RequestHandler.cpp

@@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <algorithm>
 #include <iostream>
-#include <iterator>
 
 RequestHandler::RequestHandler() : routing_machine(NULL) { }
 
@@ -60,14 +59,14 @@ void RequestHandler::handle_request(const http::Request& req, http::Reply& rep){
             req.referrer << ( 0 == req.referrer.length() ? "- " :" ") <<
             req.agent << ( 0 == req.agent.length() ? "- " :" ") << req.uri;
 
-        RouteParameters routeParameters;
-        APIGrammarParser apiParser(&routeParameters);
+        RouteParameters route_parameters;
+        APIGrammarParser api_parser(&route_parameters);
 
         std::string::iterator it = request.begin();
         const bool result = boost::spirit::qi::parse(
             it,
             request.end(),
-            apiParser
+            api_parser
         );
 
         if ( !result || (it != request.end()) ) {
@@ -93,10 +92,10 @@ void RequestHandler::handle_request(const http::Request& req, http::Reply& rep){
                 routing_machine != NULL,
                 "pointer not init'ed"
             );
-            routing_machine->RunQuery(routeParameters, rep);
+            routing_machine->RunQuery(route_parameters, rep);
             return;
         }
-    } catch(std::exception& e) {
+    } catch(const std::exception& e) {
         rep = http::Reply::StockReply(http::Reply::internalServerError);
         SimpleLogger().Write(logWARNING) <<
             "[server error] code: " << e.what() << ", uri: " << req.uri;