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

Review fixes

Browse Source
This commit is contained in:
Lev Dragunov
2017-03-22 12:00:46 +03:00
committed by Patrick Niklaus
parent b95a58591d
commit 497709da13
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/api/match_parameters.hpp
+5 -8
View File
@@ -63,23 +63,20 @@ struct MatchParameters : public RouteParameters
RouteParameters::GeometriesType::Polyline,
RouteParameters::OverviewType::Simplified,
{}),
gaps_processing(GapsType::Split), use_tidying(false)
gaps(GapsType::Split), tidy(false)
{
}
template <typename... Args>
MatchParameters(std::vector<unsigned> timestamps_,
GapsType gaps_processing_,
bool use_tidying_,
Args... args_)
MatchParameters(std::vector<unsigned> timestamps_, GapsType gaps_, bool tidy_, Args... args_)
: RouteParameters{std::forward<Args>(args_)...}, timestamps{std::move(timestamps_)},
gaps_processing(gaps_processing_), use_tidying(use_tidying_)
gaps(gaps_), tidy(tidy_)
{
}
std::vector<unsigned> timestamps;
GapsType gaps_processing;
bool use_tidying;
GapsType gaps;
bool tidy;
bool IsValid() const
{
include/server/api/match_parameter_grammar.hpp
+6 -8
View File
@@ -38,14 +38,12 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
root_rule =
BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
-('?' >
(timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1) |
(qi::lit("gaps=") >
gaps_type[ph::bind(&engine::api::MatchParameters::gaps_processing, qi::_r1) =
qi::_1]) |
(qi::lit("tidying=") > qi::bool_[ph::bind(&engine::api::MatchParameters::use_tidying,
qi::_r1) = qi::_1])) %
'&');
-('?' > (timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1) |
(qi::lit("gaps=") >
gaps_type[ph::bind(&engine::api::MatchParameters::gaps, qi::_r1) = qi::_1]) |
(qi::lit("tidy=") >
qi::bool_[ph::bind(&engine::api::MatchParameters::tidy, qi::_r1) = qi::_1])) %
'&');
}
private: