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

Rename alternative -> alternatives

Browse Source
This commit is contained in:
Patrick Niklaus
2016-03-08 22:58:17 +01:00
parent 6c00ccca9a
commit 5f457bff12
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/api/route_parameters.hpp
+3 -3
View File
@@ -30,18 +30,18 @@ struct RouteParameters : public BaseParameters
template <typename... Args>
RouteParameters(const bool steps_,
const bool alternative_,
const bool alternatives_,
const GeometriesType geometries_,
const OverviewType overview_,
std::vector<boost::optional<bool>> uturns_,
Args... args_)
: BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternative{alternative_},
: BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
geometries{geometries_}, overview{overview_}, uturns{std::move(uturns_)}
{
}
bool steps = true;
bool alternative = true;
bool alternatives = true;
GeometriesType geometries = GeometriesType::Polyline;
OverviewType overview = OverviewType::Simplified;
std::vector<boost::optional<bool>> uturns;
include/server/api/route_parameters_grammar.hpp
+5 -5
View File
@@ -56,16 +56,16 @@ struct RouteParametersGrammar : public BaseParametersGrammar
{
parameters.steps = steps;
};
const auto set_alternative = [this](const AlternativeT alternative)
const auto set_alternatives = [this](const AlternativeT alternatives)
{
parameters.alternative = alternative;
parameters.alternatives = alternatives;
};
const auto set_uturns = [this](UturnsT &uturns)
{
parameters.uturns = std::move(uturns);
};
alternative_rule = qi::lit("alternative=") >> qi::bool_;
alternatives_rule = qi::lit("alternatives=") >> qi::bool_;
steps_rule = qi::lit("steps=") >> qi::bool_;
geometries_rule = qi::lit("geometries=geojson")[set_geojson_type] |
qi::lit("geometries=polyline")[set_polyline_type];
@@ -73,7 +73,7 @@ struct RouteParametersGrammar : public BaseParametersGrammar
qi::lit("overview=full")[set_full_type] |
qi::lit("overview=false")[set_false_type];
uturns_rule = qi::lit("uturns=") >> -qi::bool_ % ";";
route_rule = steps_rule[set_steps] | alternative_rule[set_alternative] | geometries_rule |
route_rule = steps_rule[set_steps] | alternatives_rule[set_alternatives] | geometries_rule |
overview_rule | uturns_rule[set_uturns];
root_rule =
@@ -87,7 +87,7 @@ struct RouteParametersGrammar : public BaseParametersGrammar
qi::rule<Iterator> route_rule, geometries_rule, overview_rule;
qi::rule<Iterator, UturnsT()> uturns_rule;
qi::rule<Iterator, StepsT()> steps_rule;
qi::rule<Iterator, AlternativeT()> alternative_rule;
qi::rule<Iterator, AlternativeT()> alternatives_rule;
};
}
}