Polyline6 support in the REST input

include/engine/polyline_compressor.hpp

@@ -14,10 +14,8 @@ namespace engine
 {
 namespace detail
 {
-constexpr double POLYLINE_DECODING_PRECISION = 1e5;
-constexpr double POLYLINE_TO_COORDINATE = COORDINATE_PRECISION / POLYLINE_DECODING_PRECISION;
-
 std::string encode(std::vector<int> &numbers);
+std::int32_t decode_polyline_integer(std::string::const_iterator &first, std::string::const_iterator last);
 }
 using CoordVectorForwardIter = std::vector<util::Coordinate>::const_iterator;
 // Encodes geometry into polyline format.
@@ -57,7 +55,30 @@ std::string encodePolyline(CoordVectorForwardIter begin, CoordVectorForwardIter
 
 // Decodes geometry from polyline format
 // See: https://developers.google.com/maps/documentation/utilities/polylinealgorithm
-std::vector<util::Coordinate> decodePolyline(const std::string &polyline);
+
+template <unsigned POLYLINE_PRECISION = 100000>
+std::vector<util::Coordinate> decodePolyline(const std::string &polyline)
+{
+    double polyline_to_coordinate = COORDINATE_PRECISION / POLYLINE_PRECISION ;
+    std::vector<util::Coordinate> coordinates;
+    std::int32_t latitude = 0, longitude = 0;
+
+    std::string::const_iterator first = polyline.begin();
+    const std::string::const_iterator last = polyline.end();
+    while (first != last)
+    {
+        const auto dlat = detail::decode_polyline_integer(first, last);
+        const auto dlon = detail::decode_polyline_integer(first, last);
+
+        latitude += dlat;
+        longitude += dlon;
+
+        coordinates.emplace_back(
+            util::Coordinate{util::FixedLongitude{static_cast<std::int32_t>(longitude*polyline_to_coordinate)},
+                             util::FixedLatitude{static_cast<std::int32_t>(latitude*polyline_to_coordinate)}});
+    }
+    return coordinates;
+}
 }
 }
 

include/server/api/base_parameters_grammar.hpp

@@ -128,9 +128,16 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
                                           },
                                           qi::_1)];
 
+        polyline6_rule = qi::as_string[qi::lit("polyline6(") > +polyline_chars > ')']
+                                     [qi::_val = ph::bind(
+                                          [](const std::string &polyline) {
+                                              return engine::decodePolyline<1000000>(polyline);
+                                          },
+                                          qi::_1)];
+
         query_rule =
             ((location_rule % ';') |
-             polyline_rule)[ph::bind(&engine::api::BaseParameters::coordinates, qi::_r1) = qi::_1];
+             polyline_rule | polyline6_rule)[ph::bind(&engine::api::BaseParameters::coordinates, qi::_r1) = qi::_1];
 
         radiuses_rule = qi::lit("radiuses=") >
                         (-(qi::double_ | unlimited_rule) %
@@ -176,6 +183,7 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
     qi::rule<Iterator, osrm::engine::Bearing()> bearing_rule;
     qi::rule<Iterator, osrm::util::Coordinate()> location_rule;
     qi::rule<Iterator, std::vector<osrm::util::Coordinate>()> polyline_rule;
+    qi::rule<Iterator, std::vector<osrm::util::Coordinate>()> polyline6_rule;
 
     qi::rule<Iterator, unsigned char()> base64_char;
     qi::rule<Iterator, std::string()> polyline_chars;