From 954710d6cc628e3bd77e88c7c83c06056ee20423 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Wed, 12 Sep 2012 15:38:04 +0200 Subject: [PATCH] Renaming utility function to set the name of the used routing service (plugin) --- Plugins/RouteParameters.h | 2 +- Server/APIGrammar.h | 2 +- server.ini | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Plugins/RouteParameters.h b/Plugins/RouteParameters.h index e4fc99d7f..e849301cd 100644 --- a/Plugins/RouteParameters.h +++ b/Plugins/RouteParameters.h @@ -56,7 +56,7 @@ struct RouteParameters { printInstructions = b; } - void printService( const std::string & s) { + void setService( const std::string & s) { service = s; } diff --git a/Server/APIGrammar.h b/Server/APIGrammar.h index df34ae267..eb5d54b97 100644 --- a/Server/APIGrammar.h +++ b/Server/APIGrammar.h @@ -32,7 +32,7 @@ namespace qi = boost::spirit::qi; template struct APIGrammar : qi::grammar { APIGrammar(HandlerT * h) : APIGrammar::base_type(api_call), handler(h) { - api_call = qi::lit('/') >> string[boost::bind(&HandlerT::printService, handler, ::_1)] >> ('?') >> query; + api_call = qi::lit('/') >> string[boost::bind(&HandlerT::setService, handler, ::_1)] >> ('?') >> query; query = (*(zoom | output | jsonp | checksum | location | hint | compressed_geometry | language | instruction) ) ; zoom = (-qi::lit('&')) >> qi::lit('z') >> '=' >> qi::short_[boost::bind(&HandlerT::setZoomLevel, handler, ::_1)]; diff --git a/server.ini b/server.ini index 61d15263a..3fe844afa 100644 --- a/server.ini +++ b/server.ini @@ -2,10 +2,10 @@ Threads = 8 IP = 0.0.0.0 Port = 5000 -hsgrData=/opt/osm/baden-wuerttemberg.osrm.hsgr -nodesData=/opt/osm/baden-wuerttemberg.osrm.nodes -edgesData=/opt/osm/baden-wuerttemberg.osrm.edges -ramIndex=/opt/osm/baden-wuerttemberg.osrm.ramIndex -fileIndex=/opt/osm/baden-wuerttemberg.osrm.fileIndex -namesData=/opt/osm/baden-wuerttemberg.osrm.names -timestamp=/opt/osm/baden-wuerttemberg.osrm.timestamp +hsgrData=/opt/osm/berlin.osrm.hsgr +nodesData=/opt/osm/berlin.osrm.nodes +edgesData=/opt/osm/berlin.osrm.edges +ramIndex=/opt/osm/berlin.osrm.ramIndex +fileIndex=/opt/osm/berlin.osrm.fileIndex +namesData=/opt/osm/berlin.osrm.names +timestamp=/opt/osm/berlin.osrm.timestamp