sides grammar

oxidase · May 18, 2017 · 301a1cc · 301a1cc
1 parent 403db7c
commit 301a1cc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/include/engine/api/base_parameters.hpp b/include/engine/api/base_parameters.hpp
@@ -37,6 +37,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <vector>
 
+enum StartSide
+{
+    DEFAULT,
+    OPPOSITE,
+    BOTH
+
+};
+
+
 namespace osrm
 {
 namespace engine
@@ -65,6 +74,7 @@ struct BaseParameters
     std::vector<boost::optional<Hint>> hints;
     std::vector<boost::optional<double>> radiuses;
     std::vector<boost::optional<Bearing>> bearings;
+    std::vector<StartSide> sides;
 
     // Adds hints to response which can be included in subsequent requests, see `hints` above.
     bool generate_hints = true;

diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp
@@ -14,6 +14,7 @@
 #include <limits>
 #include <string>
 
+
 namespace osrm
 {
 namespace server
@@ -149,10 +150,17 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
             qi::lit("bearings=") >
             (-(qi::short_ > ',' > qi::short_))[ph::bind(add_bearing, qi::_r1, qi::_1)] % ';';
 
+        side_type.add("d", DEFAULT)("o", OPPOSITE)("b", BOTH);
+        sides_rule = qi::lit("sides=") >
+            ((side_type | qi::attr(BOTH)) % ';')[ph::bind(&engine::api::BaseParameters::sides, qi::_r1) = qi::_1];
+
+
         base_rule = radiuses_rule(qi::_r1)   //
                     | hints_rule(qi::_r1)    //
                     | bearings_rule(qi::_r1) //
-                    | generate_hints_rule(qi::_r1);
+            | generate_hints_rule(qi::_r1) //
+            | sides_rule(qi::_r1)
+            ;
     }
 
   protected:
@@ -165,6 +173,7 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
     qi::rule<Iterator, Signature> hints_rule;
 
     qi::rule<Iterator, Signature> generate_hints_rule;
+    qi::rule<Iterator, Signature> sides_rule;
 
     qi::rule<Iterator, osrm::engine::Bearing()> bearing_rule;
     qi::rule<Iterator, osrm::util::Coordinate()> location_rule;
@@ -174,6 +183,8 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
     qi::rule<Iterator, std::string()> polyline_chars;
     qi::rule<Iterator, double()> unlimited_rule;
     qi::real_parser<double, json_policy> double_;
+
+    qi::symbols<char, StartSide> side_type;
 };
 }
 }

diff --git a/unit_tests/server/parameters_parser.cpp b/unit_tests/server/parameters_parser.cpp
@@ -388,6 +388,17 @@ BOOST_AUTO_TEST_CASE(valid_route_urls)
     BOOST_CHECK_EQUAL(reference_17.geometries, result_17->geometries);
     BOOST_CHECK_EQUAL(result_2->annotations_type == RouteParameters::AnnotationsType::All, true);
     BOOST_CHECK_EQUAL(result_17->annotations, true);
+
+
+    // parse sides
+    auto result_18 = parseParameters<RouteParameters>("1,2;3,4;5,6;7,8?sides=o;b;;d");
+    BOOST_CHECK(result_18);
+    std::cout << result_18->sides.size() << "\n";
+    BOOST_CHECK_EQUAL(result_18->sides.size(), 4);
+    BOOST_CHECK_EQUAL(result_18->sides[0], OPPOSITE);
+    BOOST_CHECK_EQUAL(result_18->sides[1], BOTH);
+    BOOST_CHECK_EQUAL(result_18->sides[2], BOTH);
+    BOOST_CHECK_EQUAL(result_18->sides[3], DEFAULT);
 }
 
 BOOST_AUTO_TEST_CASE(valid_table_urls)