adapt tool to output logs with new mechanism

This commit is contained in:
Dennis Luxen 2013-08-08 16:20:05 +02:00
parent 088393ca12
commit f57519b909

View File

@ -20,6 +20,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../Library/OSRM.h" #include "../Library/OSRM.h"
#include "../Util/SimpleLogger.h"
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
@ -44,43 +45,49 @@ void print_tree(boost::property_tree::ptree const& pt, const unsigned recursion_
int main (int argc, char * argv[]) { int main (int argc, char * argv[]) {
std::cout << "\n starting up engines, compile at " LogPolicy::GetInstance().Unmute();
<< __DATE__ << ", " __TIME__ << std::endl; try {
IniFile serverConfig((argc > 1 ? argv[1] : "server.ini")); std::cout << "\n starting up engines, compile at "
OSRM routing_machine((argc > 1 ? argv[1] : "server.ini")); << __DATE__ << ", " __TIME__ << std::endl;
IniFile serverConfig((argc > 1 ? argv[1] : "server.ini"));
OSRM routing_machine((argc > 1 ? argv[1] : "server.ini"));
RouteParameters route_parameters; RouteParameters route_parameters;
route_parameters.zoomLevel = 18; //no generalization route_parameters.zoomLevel = 18; //no generalization
route_parameters.printInstructions = true; //turn by turn instructions route_parameters.printInstructions = true; //turn by turn instructions
route_parameters.alternateRoute = true; //get an alternate route, too route_parameters.alternateRoute = true; //get an alternate route, too
route_parameters.geometry = true; //retrieve geometry of route route_parameters.geometry = true; //retrieve geometry of route
route_parameters.compression = true; //polyline encoding route_parameters.compression = true; //polyline encoding
route_parameters.checkSum = UINT_MAX; //see wiki route_parameters.checkSum = UINT_MAX; //see wiki
route_parameters.service = "viaroute"; //that's routing route_parameters.service = "viaroute"; //that's routing
route_parameters.outputFormat = "json"; route_parameters.outputFormat = "json";
route_parameters.jsonpParameter = ""; //set for jsonp wrapping route_parameters.jsonpParameter = ""; //set for jsonp wrapping
route_parameters.language = ""; //unused atm route_parameters.language = ""; //unused atm
//route_parameters.hints.push_back(); // see wiki, saves I/O if done properly //route_parameters.hints.push_back(); // see wiki, saves I/O if done properly
_Coordinate start_coordinate(52.519930*1000000,13.438640*1000000); _Coordinate start_coordinate(52.519930*COORDINATE_PRECISION,13.438640*COORDINATE_PRECISION);
_Coordinate target_coordinate(52.513191*1000000,13.415852*1000000); _Coordinate target_coordinate(52.513191*COORDINATE_PRECISION,13.415852*COORDINATE_PRECISION);
route_parameters.coordinates.push_back(start_coordinate); route_parameters.coordinates.push_back(start_coordinate);
route_parameters.coordinates.push_back(target_coordinate); route_parameters.coordinates.push_back(target_coordinate);
http::Reply osrm_reply; http::Reply osrm_reply;
routing_machine.RunQuery(route_parameters, osrm_reply); routing_machine.RunQuery(route_parameters, osrm_reply);
std::cout << osrm_reply.content << std::endl; std::cout << osrm_reply.content << std::endl;
//attention: super-inefficient hack below: //attention: super-inefficient hack below:
std::stringstream ss; std::stringstream ss;
ss << osrm_reply.content; ss << osrm_reply.content;
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
boost::property_tree::read_json(ss, pt); boost::property_tree::read_json(ss, pt);
print_tree(pt, 0); print_tree(pt, 0);
} catch (std::exception & e) {
SimpleLogger().Write(logWARNING) << "caught exception: " << e.what();
return -1;
}
return 0; return 0;
} }