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

clang format

Browse Source
This commit is contained in:
karenzshea 2017-02-13 14:16:06 +01:00 committed by Patrick Niklaus
parent a61b1a3623
commit 23b07c9197
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/server/api/route_parameters_grammar.hpp
View File

@ -59,10 +59,10 @@ struct RouteParametersGrammar : public BaseParametersGrammar<Iterator, Signature
"full", engine::api::RouteParameters::OverviewType::Full)( "full", engine::api::RouteParameters::OverviewType::Full)(
"false", engine::api::RouteParameters::OverviewType::False); "false", engine::api::RouteParameters::OverviewType::False);
annotations_type.add("duration", AnnotationsType::Duration)( annotations_type.add("duration", AnnotationsType::Duration)("nodes",
"nodes", AnnotationsType::Nodes)("distance", AnnotationsType::Distance)( AnnotationsType::Nodes)(
"weight", AnnotationsType::Weight)("datasources", AnnotationsType::Datasources)( "distance", AnnotationsType::Distance)("weight", AnnotationsType::Weight)(
"speed", AnnotationsType::Speed); "datasources", AnnotationsType::Datasources)("speed", AnnotationsType::Speed);
base_rule = base_rule =
BaseGrammar::base_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1) |

7
unit_tests/server/parameters_parser.cpp
View File

@ -359,9 +359,10 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
BOOST_CHECK(result_speed); BOOST_CHECK(result_speed);
BOOST_CHECK_EQUAL(reference_speed.geometries, result_speed->geometries); BOOST_CHECK_EQUAL(reference_speed.geometries, result_speed->geometries);
BOOST_CHECK_EQUAL(reference_speed.overview, result_speed->overview); BOOST_CHECK_EQUAL(reference_speed.overview, result_speed->overview);
BOOST_CHECK_EQUAL(result_speed->annotations_type == (RouteParameters::AnnotationsType::Duration | BOOST_CHECK_EQUAL(result_speed->annotations_type ==
RouteParameters::AnnotationsType::Distance | (RouteParameters::AnnotationsType::Duration |
RouteParameters::AnnotationsType::Speed), RouteParameters::AnnotationsType::Distance |
RouteParameters::AnnotationsType::Speed),
true); true);
BOOST_CHECK_EQUAL(result_speed->annotations, true); BOOST_CHECK_EQUAL(result_speed->annotations, true);