From 10c1b38139b77ebf39dfb61e146e7745d7901a56 Mon Sep 17 00:00:00 2001 From: Denis Chaplygin Date: Mon, 16 Sep 2019 11:24:35 +0300 Subject: [PATCH] Added new base parameter 'skip_waypoints' --- include/engine/api/base_parameters.hpp | 3 +++ include/server/api/base_parameters_grammar.hpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/include/engine/api/base_parameters.hpp b/include/engine/api/base_parameters.hpp index 4e3628459..e7a49378d 100644 --- a/include/engine/api/base_parameters.hpp +++ b/include/engine/api/base_parameters.hpp @@ -87,6 +87,9 @@ struct BaseParameters // Adds hints to response which can be included in subsequent requests, see `hints` above. bool generate_hints = true; + // Remove waypoints array from the response. + bool skip_waypoints = false; + SnappingType snapping = SnappingType::Default; BaseParameters(const std::vector coordinates_ = {}, diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp index dc196ae2b..0c5791202 100644 --- a/include/server/api/base_parameters_grammar.hpp +++ b/include/server/api/base_parameters_grammar.hpp @@ -152,6 +152,10 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar qi::lit("generate_hints=") > qi::bool_[ph::bind(&engine::api::BaseParameters::generate_hints, qi::_r1) = qi::_1]; + skip_waypoints_rule = + qi::lit("skip_waypoints=") > + qi::bool_[ph::bind(&engine::api::BaseParameters::skip_waypoints, qi::_r1) = qi::_1]; + bearings_rule = qi::lit("bearings=") > (-(qi::short_ > ',' > qi::short_))[ph::bind(add_bearing, qi::_r1, qi::_1)] % ';'; @@ -183,6 +187,7 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar | hints_rule(qi::_r1) // | bearings_rule(qi::_r1) // | generate_hints_rule(qi::_r1) // + | skip_waypoints_rule(qi::_r1) // | approach_rule(qi::_r1) // | exclude_rule(qi::_r1) // | snapping_rule(qi::_r1); @@ -203,6 +208,7 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar qi::rule hints_rule; qi::rule generate_hints_rule; + qi::rule skip_waypoints_rule; qi::rule approach_rule; qi::rule exclude_rule;