From 97401ad99a87d653f6e8db186395f09c248bcc77 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Tue, 5 Apr 2016 09:56:38 +0200 Subject: [PATCH] Disable steps and alternatives by default --- features/step_definitions/trip.js | 1 + include/engine/api/route_parameters.hpp | 4 ++-- unit_tests/library/route.cpp | 6 ++++-- unit_tests/server/parameters_parser.cpp | 6 ++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/features/step_definitions/trip.js b/features/step_definitions/trip.js index b1727da3c..9662ac623 100644 --- a/features/step_definitions/trip.js +++ b/features/step_definitions/trip.js @@ -110,6 +110,7 @@ module.exports = function () { } else { var params = this.queryParams, waypoints = []; + params['steps'] = 'true'; if (row.from && row.to) { var fromNode = this.findNodeByName(row.from); if (!fromNode) throw new Error(util.format('*** unknown from-node "%s"', row.from)); diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp index b8704fca5..7c97e61bd 100644 --- a/include/engine/api/route_parameters.hpp +++ b/include/engine/api/route_parameters.hpp @@ -81,8 +81,8 @@ struct RouteParameters : public BaseParameters { } - bool steps = true; - bool alternatives = true; + bool steps = false; + bool alternatives = false; GeometriesType geometries = GeometriesType::Polyline; OverviewType overview = OverviewType::Simplified; boost::optional uturns; diff --git a/unit_tests/library/route.cpp b/unit_tests/library/route.cpp index 40f8306e6..d73172fbe 100644 --- a/unit_tests/library/route.cpp +++ b/unit_tests/library/route.cpp @@ -24,6 +24,8 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture) using namespace osrm; RouteParameters params; + params.steps = true; + params.alternatives = true; 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; 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()); @@ -102,7 +106,6 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates) BOOST_CHECK(!hint.empty()); } - // alternative=true by default const auto &routes = result.values.at("routes").get().values; BOOST_CHECK(!routes.empty()); 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().value; BOOST_CHECK(((void)summary, true)); - // steps=true by default const auto &steps = leg_object.values.at("steps").get().values; BOOST_CHECK(!steps.empty()); diff --git a/unit_tests/server/parameters_parser.cpp b/unit_tests/server/parameters_parser.cpp index e6f2d8282..c62858686 100644 --- a/unit_tests/server/parameters_parser.cpp +++ b/unit_tests/server/parameters_parser.cpp @@ -138,6 +138,8 @@ BOOST_AUTO_TEST_CASE(valid_route_urls) CHECK_EQUAL_RANGE(reference_1.coordinates, result_1->coordinates); engine::api::RouteParameters reference_2{}; + reference_2.alternatives = true; + reference_2.steps = true; reference_2.coordinates = coords_1; auto result_2 = api::parseParameters( "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( "03AhA0vnzAA_SAAA_____3wEAAAYAAAAQAAAAB4AAABAAAAAoUYBAJ4AAADlcCEDSefMAAMAAQGLSzmR")}; engine::api::RouteParameters reference_4{false, - true, + false, engine::api::RouteParameters::GeometriesType::Polyline, engine::api::RouteParameters::OverviewType::Simplified, boost::optional{}, @@ -206,7 +208,7 @@ BOOST_AUTO_TEST_CASE(valid_route_urls) boost::none, engine::Bearing{200, 10}, engine::Bearing{100, 5}, }; engine::api::RouteParameters reference_5{false, - true, + false, engine::api::RouteParameters::GeometriesType::Polyline, engine::api::RouteParameters::OverviewType::Simplified, boost::optional{},