Runs scripts/format.sh

include/server/api/base_parameters_grammar.hpp

@@ -33,22 +33,26 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<std::string::iterator>
     using Iterator = std::string::iterator;
     using RadiusesT = std::vector<boost::optional<double>>;
 
-    BaseParametersGrammar(qi::rule<Iterator> &root_rule_,
-                          engine::api::BaseParameters &parameters_)
+    BaseParametersGrammar(qi::rule<Iterator> &root_rule_, engine::api::BaseParameters &parameters_)
         : BaseParametersGrammar::base_type(root_rule_), base_parameters(parameters_)
     {
-        const auto add_bearing = [this](boost::optional<boost::fusion::vector2<short, short>> bearing_range) {
+        const auto add_bearing =
+            [this](boost::optional<boost::fusion::vector2<short, short>> bearing_range)
+        {
             boost::optional<engine::api::BaseParameters::Bearing> bearing;
             if (bearing_range)
             {
-                bearing = engine::api::BaseParameters::Bearing {boost::fusion::at_c<0>(*bearing_range), boost::fusion::at_c<1>(*bearing_range)};
+                bearing = engine::api::BaseParameters::Bearing{
+                    boost::fusion::at_c<0>(*bearing_range), boost::fusion::at_c<1>(*bearing_range)};
             }
             base_parameters.bearings.push_back(std::move(bearing));
         };
-        const auto set_radiuses = [this](RadiusesT& radiuses) {
+        const auto set_radiuses = [this](RadiusesT &radiuses)
+        {
             base_parameters.radiuses = std::move(radiuses);
         };
-        const auto add_hint = [this](const std::string& hint_string) {
+        const auto add_hint = [this](const std::string &hint_string)
+        {
             if (hint_string.size() > 0)
             {
                 base_parameters.hints.push_back(engine::Hint::FromBase64(hint_string));
@@ -56,9 +60,9 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<std::string::iterator>
         };
         const auto add_coordinate = [this](const boost::fusion::vector<double, double> &lonLat)
         {
-            base_parameters.coordinates.emplace_back(
-                util::Coordinate(util::FixedLongitude(boost::fusion::at_c<0>(lonLat) * COORDINATE_PRECISION),
-                                 util::FixedLatitude(boost::fusion::at_c<1>(lonLat) * COORDINATE_PRECISION)));
+            base_parameters.coordinates.emplace_back(util::Coordinate(
+                util::FixedLongitude(boost::fusion::at_c<0>(lonLat) * COORDINATE_PRECISION),
+                util::FixedLatitude(boost::fusion::at_c<1>(lonLat) * COORDINATE_PRECISION)));
         };
         const auto polyline_to_coordinates = [this](const std::string &polyline)
         {
@@ -70,7 +74,9 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<std::string::iterator>
         base64_char = qi::char_("a-zA-Z0-9--_");
 
         radiuses_rule = qi::lit("radiuses=") >> -qi::double_ % ";";
-        hints_rule = qi::lit("hints=") >> qi::as_string[qi::repeat(engine::ENCODED_HINT_SIZE)[base64_char]][add_hint] % ";";
+        hints_rule =
+            qi::lit("hints=") >>
+            qi::as_string[qi::repeat(engine::ENCODED_HINT_SIZE)[base64_char]][add_hint] % ";";
         bearings_rule =
             qi::lit("bearings=") >> (-(qi::short_ >> ',' >> qi::short_))[add_bearing] % ";";
         polyline_rule = qi::as_string[qi::lit("polyline(") >> +polyline_chars >>
@@ -81,11 +87,11 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar<std::string::iterator>
         base_rule = bearings_rule | radiuses_rule[set_radiuses] | hints_rule;
     }
 
-protected:
+  protected:
     qi::rule<Iterator> base_rule;
     qi::rule<Iterator> query_rule;
 
-private:
+  private:
     engine::api::BaseParameters &base_parameters;
     qi::rule<Iterator> bearings_rule;
     qi::rule<Iterator> hints_rule;

include/server/api/match_parameter_grammar.hpp

@@ -68,9 +68,10 @@ struct MatchParametersGrammar final : public BaseParametersGrammar
                         qi::lit("overview=full")[set_full_type] |
                         qi::lit("overview=false")[set_false_type];
         timestamps_rule = qi::lit("timestamps=") >> qi::uint_ % ";";
-        match_rule = steps_rule[set_steps] | geometries_rule |
-                     overview_rule | timestamps_rule[set_timestamps];
-        root_rule = query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (match_rule | base_rule) % '&');
+        match_rule = steps_rule[set_steps] | geometries_rule | overview_rule |
+                     timestamps_rule[set_timestamps];
+        root_rule =
+            query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (match_rule | base_rule) % '&');
     }
 
     engine::api::MatchParameters parameters;

include/server/api/nearest_parameter_grammar.hpp

@@ -31,7 +31,8 @@ struct NearestParametersGrammar final : public BaseParametersGrammar
             parameters.number_of_results = number;
         };
         nearest_rule = (qi::lit("number=") >> qi::uint_)[set_number];
-        root_rule = query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (nearest_rule | base_rule) % '&');
+        root_rule =
+            query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (nearest_rule | base_rule) % '&');
     }
 
     engine::api::NearestParameters parameters;

include/server/api/route_parameters_grammar.hpp

@@ -76,7 +76,8 @@ struct RouteParametersGrammar : public BaseParametersGrammar
         route_rule = steps_rule[set_steps] | alternative_rule[set_alternative] | geometries_rule |
                      overview_rule | uturns_rule[set_uturns];
 
-        root_rule = query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (route_rule | base_rule) % '&');
+        root_rule =
+            query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (route_rule | base_rule) % '&');
     }
 
     engine::api::RouteParameters parameters;

include/server/api/table_parameter_grammar.hpp

@@ -36,11 +36,14 @@ struct TableParametersGrammar final : public BaseParametersGrammar
         {
             parameters.sources = std::move(sources);
         };
-        destinations_rule = (qi::lit("destinations=") >> (qi::ulong_ % ";")[set_destiantions]) | qi::lit("destinations=all");
-        sources_rule = (qi::lit("sources=") >> (qi::ulong_ % ";")[set_sources]) | qi::lit("sources=all");
+        destinations_rule = (qi::lit("destinations=") >> (qi::ulong_ % ";")[set_destiantions]) |
+                            qi::lit("destinations=all");
+        sources_rule =
+            (qi::lit("sources=") >> (qi::ulong_ % ";")[set_sources]) | qi::lit("sources=all");
         table_rule = destinations_rule | sources_rule;
 
-        root_rule = query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (table_rule | base_rule) % '&');
+        root_rule =
+            query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (table_rule | base_rule) % '&');
     }
 
     engine::api::TableParameters parameters;

include/server/api/tile_parameter_grammar.hpp

@@ -26,20 +26,29 @@ struct TileParametersGrammar final : boost::spirit::qi::grammar<std::string::ite
 {
     using Iterator = std::string::iterator;
 
-    TileParametersGrammar()
-        : TileParametersGrammar::base_type(root_rule)
+    TileParametersGrammar() : TileParametersGrammar::base_type(root_rule)
     {
-        const auto set_x = [this](const unsigned x_) { parameters.x = x_; };
-        const auto set_y = [this](const unsigned y_) { parameters.y = y_; };
-        const auto set_z = [this](const unsigned z_) { parameters.z = z_; };
+        const auto set_x = [this](const unsigned x_)
+        {
+            parameters.x = x_;
+        };
+        const auto set_y = [this](const unsigned y_)
+        {
+            parameters.y = y_;
+        };
+        const auto set_z = [this](const unsigned z_)
+        {
+            parameters.z = z_;
+        };
 
-        query_rule = qi::lit("tile(") >> qi::uint_[set_x] >> qi::lit(",") >> qi::uint_[set_y] >> qi::lit(",") >> qi::uint_[set_z] >> qi::lit(")");
+        query_rule = qi::lit("tile(") >> qi::uint_[set_x] >> qi::lit(",") >> qi::uint_[set_y] >>
+                     qi::lit(",") >> qi::uint_[set_z] >> qi::lit(")");
 
         root_rule = query_rule >> qi::lit(".mvt");
     }
     engine::api::TileParameters parameters;
 
-private:
+  private:
     qi::rule<Iterator> root_rule;
     qi::rule<Iterator> query_rule;
 };

include/server/api/trip_parameter_grammar.hpp

@@ -64,7 +64,8 @@ struct TripParametersGrammar final : public BaseParametersGrammar
                         qi::lit("overview=false")[set_false_type];
         trip_rule = steps_rule[set_steps] | geometries_rule | overview_rule;
 
-        root_rule = query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (trip_rule | base_rule) % '&');
+        root_rule =
+            query_rule >> -qi::lit(".json") >> -(qi::lit("?") >> (trip_rule | base_rule) % '&');
     }
 
     engine::api::TripParameters parameters;

include/server/api/url_parser.hpp

@@ -15,14 +15,13 @@ namespace api
 {
 
 // Starts parsing and iter and modifies it until iter == end or parsing failed
-boost::optional<ParsedURL> parseURL(std::string::iterator& iter, std::string::iterator end);
+boost::optional<ParsedURL> parseURL(std::string::iterator &iter, std::string::iterator end);
 // copy on purpose because we need mutability
 inline boost::optional<ParsedURL> parseURL(std::string url_string)
 {
     auto iter = url_string.begin();
     return parseURL(iter, url_string.end());
 }
-
 }
 }
 }

include/server/service/utils.hpp

@@ -24,8 +24,6 @@ bool constrainParamSize(const char *msg_template,
     }
     return false;
 }
-
 }
 }
 }
-

include/server/service_handler.hpp

@@ -32,7 +32,6 @@ class ServiceHandler
     engine::Status RunQuery(api::ParsedURL parsed_url, ResultT &result);
 
   private:
-
     std::unordered_map<std::string, std::unique_ptr<service::BaseService>> service_map;
     OSRM routing_machine;
 };