Trip with Fixed Start and End points (TFSE) (#3408)
* fixed start and end trip feature to trip service
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "server/api/route_parameters_grammar.hpp"
|
||||
#include "engine/api/trip_parameters.hpp"
|
||||
|
||||
#include <boost/spirit/include/phoenix.hpp>
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
|
||||
namespace osrm
|
||||
@@ -15,6 +16,7 @@ namespace api
|
||||
|
||||
namespace
|
||||
{
|
||||
namespace ph = boost::phoenix;
|
||||
namespace qi = boost::spirit::qi;
|
||||
}
|
||||
|
||||
@@ -26,12 +28,37 @@ struct TripParametersGrammar final : public RouteParametersGrammar<Iterator, Sig
|
||||
|
||||
TripParametersGrammar() : BaseGrammar(root_rule)
|
||||
{
|
||||
roundtrip_rule =
|
||||
qi::lit("roundtrip=") >
|
||||
qi::bool_[ph::bind(&engine::api::TripParameters::roundtrip, qi::_r1) = qi::_1];
|
||||
|
||||
source_type.add("any", engine::api::TripParameters::SourceType::Any)(
|
||||
"first", engine::api::TripParameters::SourceType::First);
|
||||
|
||||
destination_type.add("any", engine::api::TripParameters::DestinationType::Any)(
|
||||
"last", engine::api::TripParameters::DestinationType::Last);
|
||||
|
||||
source_rule = qi::lit("source=") >
|
||||
source_type[ph::bind(&engine::api::TripParameters::source, qi::_r1) = qi::_1];
|
||||
|
||||
destination_rule =
|
||||
qi::lit("destination=") >
|
||||
destination_type[ph::bind(&engine::api::TripParameters::destination, qi::_r1) = qi::_1];
|
||||
|
||||
root_rule = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
|
||||
-('?' > (BaseGrammar::base_rule(qi::_r1)) % '&');
|
||||
-('?' > (roundtrip_rule(qi::_r1) | source_rule(qi::_r1) |
|
||||
destination_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) %
|
||||
'&');
|
||||
}
|
||||
|
||||
private:
|
||||
qi::rule<Iterator, Signature> source_rule;
|
||||
qi::rule<Iterator, Signature> destination_rule;
|
||||
qi::rule<Iterator, Signature> roundtrip_rule;
|
||||
qi::rule<Iterator, Signature> root_rule;
|
||||
|
||||
qi::symbols<char, engine::api::TripParameters::SourceType> source_type;
|
||||
qi::symbols<char, engine::api::TripParameters::DestinationType> destination_type;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user