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

Disable steps and alternatives by default

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-04-05 09:56:38 +02:00 committed by Patrick Niklaus
parent 59f5e364c1
commit 97401ad99a
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
features/step_definitions/trip.js
View File

@ -110,6 +110,7 @@ module.exports = function () {
} else { } else {
var params = this.queryParams, var params = this.queryParams,
waypoints = []; waypoints = [];
params['steps'] = 'true';
if (row.from && row.to) { if (row.from && row.to) {
var fromNode = this.findNodeByName(row.from); var fromNode = this.findNodeByName(row.from);
if (!fromNode) throw new Error(util.format('*** unknown from-node "%s"', row.from)); if (!fromNode) throw new Error(util.format('*** unknown from-node "%s"', row.from));

4
include/engine/api/route_parameters.hpp
View File

@ -81,8 +81,8 @@ struct RouteParameters : public BaseParameters
{ {
} }
bool steps = true; bool steps = false;
bool alternatives = true; bool alternatives = false;
GeometriesType geometries = GeometriesType::Polyline; GeometriesType geometries = GeometriesType::Polyline;
OverviewType overview = OverviewType::Simplified; OverviewType overview = OverviewType::Simplified;
boost::optional<bool> uturns; boost::optional<bool> uturns;

6
unit_tests/library/route.cpp
View File

@ -24,6 +24,8 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture)
using namespace osrm; using namespace osrm;
RouteParameters params; RouteParameters params;
params.steps = true;
params.alternatives = true;
params.coordinates.push_back(get_dummy_location()); params.coordinates.push_back(get_dummy_location());
params.coordinates.push_back(get_dummy_location()); params.coordinates.push_back(get_dummy_location());
@ -70,6 +72,8 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
using namespace osrm; using namespace osrm;
RouteParameters params; RouteParameters params;
params.steps = true;
params.alternatives = true;
params.coordinates.push_back(get_dummy_location()); params.coordinates.push_back(get_dummy_location());
params.coordinates.push_back(get_dummy_location()); params.coordinates.push_back(get_dummy_location());
params.coordinates.push_back(get_dummy_location()); params.coordinates.push_back(get_dummy_location());
@ -102,7 +106,6 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
BOOST_CHECK(!hint.empty()); BOOST_CHECK(!hint.empty());
} }
// alternative=true by default
const auto &routes = result.values.at("routes").get<json::Array>().values; const auto &routes = result.values.at("routes").get<json::Array>().values;
BOOST_CHECK(!routes.empty()); BOOST_CHECK(!routes.empty());
BOOST_CHECK(routes.size() > 1); BOOST_CHECK(routes.size() > 1);
@ -138,7 +141,6 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
const auto summary = leg_object.values.at("summary").get<json::String>().value; const auto summary = leg_object.values.at("summary").get<json::String>().value;
BOOST_CHECK(((void)summary, true)); BOOST_CHECK(((void)summary, true));
// steps=true by default
const auto &steps = leg_object.values.at("steps").get<json::Array>().values; const auto &steps = leg_object.values.at("steps").get<json::Array>().values;
BOOST_CHECK(!steps.empty()); BOOST_CHECK(!steps.empty());

6
unit_tests/server/parameters_parser.cpp
View File

@ -138,6 +138,8 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
CHECK_EQUAL_RANGE(reference_1.coordinates, result_1->coordinates); CHECK_EQUAL_RANGE(reference_1.coordinates, result_1->coordinates);
engine::api::RouteParameters reference_2{}; engine::api::RouteParameters reference_2{};
reference_2.alternatives = true;
reference_2.steps = true;
reference_2.coordinates = coords_1; reference_2.coordinates = coords_1;
auto result_2 = api::parseParameters<engine::api::RouteParameters>( auto result_2 = api::parseParameters<engine::api::RouteParameters>(
"1,2;3,4?steps=true&alternatives=true&geometries=polyline&overview=simplified"); "1,2;3,4?steps=true&alternatives=true&geometries=polyline&overview=simplified");
@ -178,7 +180,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
engine::Hint::FromBase64( engine::Hint::FromBase64(
"03AhA0vnzAA_SAAA_____3wEAAAYAAAAQAAAAB4AAABAAAAAoUYBAJ4AAADlcCEDSefMAAMAAQGLSzmR")}; "03AhA0vnzAA_SAAA_____3wEAAAYAAAAQAAAAB4AAABAAAAAoUYBAJ4AAADlcCEDSefMAAMAAQGLSzmR")};
engine::api::RouteParameters reference_4{false, engine::api::RouteParameters reference_4{false,
true, false,
engine::api::RouteParameters::GeometriesType::Polyline, engine::api::RouteParameters::GeometriesType::Polyline,
engine::api::RouteParameters::OverviewType::Simplified, engine::api::RouteParameters::OverviewType::Simplified,
boost::optional<bool>{}, boost::optional<bool>{},
@ -206,7 +208,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
boost::none, engine::Bearing{200, 10}, engine::Bearing{100, 5}, boost::none, engine::Bearing{200, 10}, engine::Bearing{100, 5},
}; };
engine::api::RouteParameters reference_5{false, engine::api::RouteParameters reference_5{false,
true, false,
engine::api::RouteParameters::GeometriesType::Polyline, engine::api::RouteParameters::GeometriesType::Polyline,
engine::api::RouteParameters::OverviewType::Simplified, engine::api::RouteParameters::OverviewType::Simplified,
boost::optional<bool>{}, boost::optional<bool>{},