Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Formatting pass

Browse Source
This commit is contained in:
Whytro 2023-03-21 01:53:09 +09:00
parent f5fddc135f
commit 0c9563095a
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/engine/engine.hpp
View File

@ -52,7 +52,7 @@ template <typename Algorithm> class Engine final : public EngineInterface
match_plugin(config.max_locations_map_matching, match_plugin(config.max_locations_map_matching,
config.max_radius_map_matching, config.max_radius_map_matching,
config.default_radius), // config.default_radius), //
tile_plugin() // tile_plugin() //
{ {
if (config.use_shared_memory) if (config.use_shared_memory)

3
include/engine/plugins/nearest.hpp
View File

@ -13,8 +13,7 @@ namespace osrm::engine::plugins
class NearestPlugin final : public BasePlugin class NearestPlugin final : public BasePlugin
{ {
public: public:
explicit NearestPlugin(const int max_results, explicit NearestPlugin(const int max_results, const boost::optional<double> default_radius);
const boost::optional<double> default_radius);
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::NearestParameters &params, const api::NearestParameters &params,

3
include/engine/plugins/trip.hpp
View File

@ -32,8 +32,7 @@ class TripPlugin final : public BasePlugin
const bool roundtrip) const; const bool roundtrip) const;
public: public:
explicit TripPlugin(const int max_locations_trip_, explicit TripPlugin(const int max_locations_trip_, const boost::optional<double> default_radius)
const boost::optional<double> default_radius)
: max_locations_trip(max_locations_trip_) : max_locations_trip(max_locations_trip_)
{ {
this->default_radius = default_radius; this->default_radius = default_radius;

34
src/engine/plugins/match.cpp
View File

@ -181,25 +181,29 @@ Status MatchPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
if (tidied.parameters.radiuses.empty()) if (tidied.parameters.radiuses.empty())
{ {
search_radiuses.resize(tidied.parameters.coordinates.size(), search_radiuses.resize(tidied.parameters.coordinates.size(),
default_radius.has_value() ? *default_radius : default_radius.has_value()
routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER); ? *default_radius
: routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER);
} }
else else
{ {
search_radiuses.resize(tidied.parameters.coordinates.size()); search_radiuses.resize(tidied.parameters.coordinates.size());
std::transform(tidied.parameters.radiuses.begin(), std::transform(
tidied.parameters.radiuses.end(), tidied.parameters.radiuses.begin(),
search_radiuses.begin(), tidied.parameters.radiuses.end(),
[default_radius = this->default_radius](const boost::optional<double> &maybe_radius) { search_radiuses.begin(),
if (maybe_radius) [default_radius = this->default_radius](const boost::optional<double> &maybe_radius) {
{ if (maybe_radius)
return *maybe_radius * RADIUS_MULTIPLIER; {
} return *maybe_radius * RADIUS_MULTIPLIER;
else }
{ else
return default_radius.has_value() ? *default_radius : routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER; {
} return default_radius.has_value()
}); ? *default_radius
: routing_algorithms::DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER;
}
});
} }
auto candidates_lists = auto candidates_lists =

3
src/engine/plugins/nearest.cpp
View File

@ -10,8 +10,7 @@
namespace osrm::engine::plugins namespace osrm::engine::plugins
{ {
NearestPlugin::NearestPlugin(const int max_results_, NearestPlugin::NearestPlugin(const int max_results_, const boost::optional<double> default_radius_)
const boost::optional<double> default_radius_)
: max_results{max_results_} : max_results{max_results_}
{ {
this->default_radius = default_radius_; this->default_radius = default_radius_;