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

set RouteParameters annotations member, when constructor only specifies annotations_type, add unit_tests

Browse Source
This commit is contained in:
karenzshea 2017-01-30 15:13:03 +01:00 committed by Patrick Niklaus
parent f1427a834d
commit 3106b5dd9e
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,9 @@ struct RouteParametersGrammar : public BaseParametersGrammar<Iterator, Signature
{ {
const auto add_annotation = [](engine::api::RouteParameters &route_parameters, const auto add_annotation = [](engine::api::RouteParameters &route_parameters,
engine::api::RouteParameters::AnnotationsType &route_param) { engine::api::RouteParameters::AnnotationsType &route_param) {
return route_parameters.annotations_type = route_parameters.annotations_type | route_param; route_parameters.annotations_type = route_parameters.annotations_type | route_param;
route_parameters.annotations = route_parameters.annotations_type != engine::api::RouteParameters::AnnotationsType::None;
return route_parameters;
}; };
geometries_type.add("geojson", engine::api::RouteParameters::GeometriesType::GeoJSON)( geometries_type.add("geojson", engine::api::RouteParameters::GeometriesType::GeoJSON)(

37
unit_tests/server/parameters_parser.cpp
View File

@ -65,6 +65,7 @@ BOOST_AUTO_TEST_CASE(invalid_route_urls)
BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(std::string{"1,2;3,4"} + '\0' + ".json"), BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(std::string{"1,2;3,4"} + '\0' + ".json"),
7); 7);
BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(std::string{"1,2;3,"} + '\0'), 6); BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(std::string{"1,2;3,"} + '\0'), 6);
BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>("1,2;3,4&annotations=distances"), 7UL);
// BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(), ); // BOOST_CHECK_EQUAL(testInvalidOptions<RouteParameters>(), );
} }
@ -128,6 +129,9 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_2.radiuses, result_2->radiuses); CHECK_EQUAL_RANGE(reference_2.radiuses, result_2->radiuses);
CHECK_EQUAL_RANGE(reference_2.coordinates, result_2->coordinates); CHECK_EQUAL_RANGE(reference_2.coordinates, result_2->coordinates);
CHECK_EQUAL_RANGE(reference_2.hints, result_2->hints); CHECK_EQUAL_RANGE(reference_2.hints, result_2->hints);
BOOST_CHECK_EQUAL(
static_cast<bool>(result_2->annotations_type & RouteParameters::AnnotationsType::All),
true);
RouteParameters reference_3{false, RouteParameters reference_3{false,
false, false,
@ -309,7 +313,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_10.coordinates, result_10->coordinates); CHECK_EQUAL_RANGE(reference_10.coordinates, result_10->coordinates);
CHECK_EQUAL_RANGE(reference_10.hints, result_10->hints); CHECK_EQUAL_RANGE(reference_10.hints, result_10->hints);
// Do not generate Hints when they are explicitely disabled // Do not generate Hints when they are explicitly disabled
auto result_11 = parseParameters<RouteParameters>("1,2;3,4?generate_hints=false"); auto result_11 = parseParameters<RouteParameters>("1,2;3,4?generate_hints=false");
BOOST_CHECK(result_11); BOOST_CHECK(result_11);
BOOST_CHECK_EQUAL(result_11->generate_hints, false); BOOST_CHECK_EQUAL(result_11->generate_hints, false);
@ -321,6 +325,37 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
auto result_13 = parseParameters<RouteParameters>("1,2;3,4"); auto result_13 = parseParameters<RouteParameters>("1,2;3,4");
BOOST_CHECK(result_13); BOOST_CHECK(result_13);
BOOST_CHECK_EQUAL(result_13->generate_hints, true); BOOST_CHECK_EQUAL(result_13->generate_hints, true);
// parse single annotations value correctly
RouteParameters reference_14{};
reference_14.annotations_type = RouteParameters::AnnotationsType::Duration;
reference_14.coordinates = coords_1;
auto result_14 = parseParameters<RouteParameters>("1,2;3,4?geometries=polyline&"
"overview=simplified&annotations=duration");
BOOST_CHECK(result_14);
BOOST_CHECK_EQUAL(reference_14.geometries, result_14->geometries);
BOOST_CHECK_EQUAL(
static_cast<bool>(result_2->annotations_type & RouteParameters::AnnotationsType::Duration),
true);
BOOST_CHECK_EQUAL(result_14->annotations, true);
// parse multiple annotations correctly
RouteParameters reference_15{};
reference_15.annotations_type = RouteParameters::AnnotationsType::Duration |
RouteParameters::AnnotationsType::Weight |
RouteParameters::AnnotationsType::Nodes;
reference_15.coordinates = coords_1;
auto result_15 =
parseParameters<RouteParameters>("1,2;3,4?geometries=polyline&"
"overview=simplified&annotations=duration,weight,nodes");
BOOST_CHECK(result_15);
BOOST_CHECK_EQUAL(reference_15.geometries, result_15->geometries);
BOOST_CHECK_EQUAL(
static_cast<bool>(result_2->annotations_type & (RouteParameters::AnnotationsType::Duration |
RouteParameters::AnnotationsType::Weight |
RouteParameters::AnnotationsType::Nodes)),
true);
BOOST_CHECK_EQUAL(result_15->annotations, true);
} }
BOOST_AUTO_TEST_CASE(valid_table_urls) BOOST_AUTO_TEST_CASE(valid_table_urls)