Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove last bits of GPX support code

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-01 23:44:07 +01:00
parent 82f7ab2ba5
commit a0b4fcc05a
3 changed files with 2 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/server/api_grammar.hpp
View File

@ -62,8 +62,7 @@ template <typename Iterator, class HandlerT> struct APIGrammar : qi::grammar<Ite
destination_with_options = destination >> -location_options;
zoom = (-qi::lit('&')) >> qi::lit('z') >> '=' >>
qi::short_[boost::bind(&HandlerT::SetZoomLevel, handler, ::_1)];
output = (-qi::lit('&')) >> qi::lit("output") >> '=' >>
string[boost::bind(&HandlerT::SetOutputFormat, handler, ::_1)];
output = (-qi::lit('&')) >> qi::lit("output=json");
jsonp = (-qi::lit('&')) >> qi::lit("jsonp") >> '=' >>
stringwithPercent[boost::bind(&HandlerT::SetJSONpParameter, handler, ::_1)];
checksum = (-qi::lit('&')) >> qi::lit("checksum") >> '=' >>

115
include/util/xml_renderer.hpp
View File

@ -1,115 +0,0 @@
#ifndef XML_RENDERER_HPP
#define XML_RENDERER_HPP
#include "util/cast.hpp"
#include "osrm/json_container.hpp"
namespace osrm
{
namespace util
{
namespace json
{
struct XMLToArrayRenderer : mapbox::util::static_visitor<>
{
explicit XMLToArrayRenderer(std::vector<char> &_out) : out(_out) {}
void operator()(const String &string) const
{
out.push_back('\"');
out.insert(out.end(), string.value.begin(), string.value.end());
out.push_back('\"');
}
void operator()(const Number &number) const
{
const std::string number_string = cast::to_string_with_precision(number.value);
out.insert(out.end(), number_string.begin(), number_string.end());
}
void operator()(const Object &object) const
{
for (auto &&each : object.values)
{
if (each.first.at(0) != '_')
{
out.push_back('<');
out.insert(out.end(), each.first.begin(), each.first.end());
}
else
{
out.push_back(' ');
out.insert(out.end(), ++(each).first.begin(), each.first.end());
out.push_back('=');
}
mapbox::util::apply_visitor(XMLToArrayRenderer(out), each.second);
if (each.first.at(0) != '_')
{
out.push_back('/');
out.push_back('>');
}
}
}
void operator()(const Array &array) const
{
for (auto &&each : array.values)
{
mapbox::util::apply_visitor(XMLToArrayRenderer(out), each);
}
}
void operator()(const True &) const
{
const std::string temp("true");
out.insert(out.end(), temp.begin(), temp.end());
}
void operator()(const False &) const
{
const std::string temp("false");
out.insert(out.end(), temp.begin(), temp.end());
}
void operator()(const Null &) const
{
const std::string temp("null");
out.insert(out.end(), temp.begin(), temp.end());
}
private:
std::vector<char> &out;
};
template <class JSONObject> inline void xml_render(std::vector<char> &out, const JSONObject &object)
{
Value value = object;
mapbox::util::apply_visitor(XMLToArrayRenderer(out), value);
}
template <class JSONObject> inline void gpx_render(std::vector<char> &out, const JSONObject &object)
{
// add header
const std::string header{
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><gpx creator=\"OSRM Routing Engine\""
" version=\"1.1\" xmlns=\"http://www.topografix.com/GPX/1/1\" xmlns:xsi=\"http:"
"//www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.topogr"
"afix.com/GPX/1/1 gpx.xsd\"><metadata><copyright author=\"Project OSRM\"><lice"
"nse>Data (c) OpenStreetMap contributors (ODbL)</license></copyright></metadat"
"a><rte>"};
out.insert(out.end(), header.begin(), header.end());
xml_render(out, object);
const std::string footer{"</rte></gpx>"};
out.insert(out.end(), footer.begin(), footer.end());
}
} // namespace json
} // namespace util
} // namespace osrm
#endif // XML_RENDERER_HPP

11
src/server/request_handler.cpp
View File

@ -7,7 +7,6 @@
#include "util/json_renderer.hpp"
#include "util/simple_logger.hpp"
#include "util/string_util.hpp"
#include "util/xml_renderer.hpp"
#include "util/typedefs.hpp"
#include "engine/route_parameters.hpp"
@ -117,15 +116,7 @@ void RequestHandler::handle_request(const http::request &current_request,
// set headers
current_reply.headers.emplace_back("Content-Length",
std::to_string(current_reply.content.size()));
if ("gpx" == route_parameters.output_format)
{ // gpx file
util::json::gpx_render(current_reply.content, json_result.values["route"]);
current_reply.headers.emplace_back("Content-Type",
"application/gpx+xml; charset=UTF-8");
current_reply.headers.emplace_back("Content-Disposition",
"attachment; filename=\"route.gpx\"");
}
else if (route_parameters.jsonp_parameter.empty())
if (route_parameters.jsonp_parameter.empty())
{ // json file
util::json::render(current_reply.content, json_result);
current_reply.headers.emplace_back("Content-Type", "application/json; charset=UTF-8");