diff --git a/include/engine/engine.hpp b/include/engine/engine.hpp index 233401bf4..3e479e5cd 100644 --- a/include/engine/engine.hpp +++ b/include/engine/engine.hpp @@ -52,7 +52,7 @@ template class Engine final : public EngineInterface match_plugin(config.max_locations_map_matching, config.max_radius_map_matching, config.default_radius), // - tile_plugin() // + tile_plugin() // { if (config.use_shared_memory) diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp index ac5a8511a..415639b2c 100644 --- a/include/engine/plugins/nearest.hpp +++ b/include/engine/plugins/nearest.hpp @@ -13,8 +13,7 @@ namespace osrm::engine::plugins class NearestPlugin final : public BasePlugin { public: - explicit NearestPlugin(const int max_results, - const boost::optional default_radius); + explicit NearestPlugin(const int max_results, const boost::optional default_radius); Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, const api::NearestParameters ¶ms, diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp index cf84264a3..4b231ca06 100644 --- a/include/engine/plugins/trip.hpp +++ b/include/engine/plugins/trip.hpp @@ -32,8 +32,7 @@ class TripPlugin final : public BasePlugin const bool roundtrip) const; public: - explicit TripPlugin(const int max_locations_trip_, - const boost::optional default_radius) + explicit TripPlugin(const int max_locations_trip_, const boost::optional default_radius) : max_locations_trip(max_locations_trip_) { this->default_radius = default_radius; diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp index 5575e6d17..90517df18 100644 --- a/src/engine/plugins/match.cpp +++ b/src/engine/plugins/match.cpp @@ -181,25 +181,29 @@ Status MatchPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms, if (tidied.parameters.radiuses.empty()) { search_radiuses.resize(tidied.parameters.coordinates.size(), - default_radius.has_value() ? *default_radius : - routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER); + default_radius.has_value() + ? *default_radius + : routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER); } else { search_radiuses.resize(tidied.parameters.coordinates.size()); - std::transform(tidied.parameters.radiuses.begin(), - tidied.parameters.radiuses.end(), - search_radiuses.begin(), - [default_radius = this->default_radius](const boost::optional &maybe_radius) { - if (maybe_radius) - { - return *maybe_radius * RADIUS_MULTIPLIER; - } - else - { - return default_radius.has_value() ? *default_radius : routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER; - } - }); + std::transform( + tidied.parameters.radiuses.begin(), + tidied.parameters.radiuses.end(), + search_radiuses.begin(), + [default_radius = this->default_radius](const boost::optional &maybe_radius) { + if (maybe_radius) + { + return *maybe_radius * RADIUS_MULTIPLIER; + } + else + { + return default_radius.has_value() + ? *default_radius + : routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER; + } + }); } auto candidates_lists = diff --git a/src/engine/plugins/nearest.cpp b/src/engine/plugins/nearest.cpp index c91bfba0c..a4f3233d4 100644 --- a/src/engine/plugins/nearest.cpp +++ b/src/engine/plugins/nearest.cpp @@ -10,8 +10,7 @@ namespace osrm::engine::plugins { -NearestPlugin::NearestPlugin(const int max_results_, - const boost::optional default_radius_) +NearestPlugin::NearestPlugin(const int max_results_, const boost::optional default_radius_) : max_results{max_results_} { this->default_radius = default_radius_;