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

Adjusted handling/init of default_radius value

Browse Source
This commit is contained in:
whytro 2023-03-21 20:52:25 +09:00
parent 0c9563095a
commit 981b7accb3
9 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/engine/plugins/match.hpp
View File

@ -22,11 +22,11 @@ class MatchPlugin : public BasePlugin
MatchPlugin(const int max_locations_map_matching, MatchPlugin(const int max_locations_map_matching,
const double max_radius_map_matching, const double max_radius_map_matching,
const boost::optional<double> default_radius) boost::optional<double> default_radius)
: max_locations_map_matching(max_locations_map_matching), : BasePlugin(std::move(default_radius))
, max_locations_map_matching(max_locations_map_matching),
max_radius_map_matching(max_radius_map_matching) max_radius_map_matching(max_radius_map_matching)
{ {
this->default_radius = default_radius;
} }
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,

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

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

9
include/engine/plugins/plugin_base.hpp
View File

@ -27,6 +27,13 @@ namespace osrm::engine::plugins
class BasePlugin class BasePlugin
{ {
protected: protected:
BasePlugin() = default;
BasePlugin(boost::optional<double> default_radius_)
: default_radius(std::move(default_radius_))
{
}
bool CheckAllCoordinates(const std::vector<util::Coordinate> &coordinates) const bool CheckAllCoordinates(const std::vector<util::Coordinate> &coordinates) const
{ {
return !std::any_of( return !std::any_of(
@ -321,7 +328,7 @@ class BasePlugin
std::to_string(missing_index); std::to_string(missing_index);
} }
boost::optional<double> default_radius; const boost::optional<double> default_radius;
}; };
} // namespace osrm::engine::plugins } // namespace osrm::engine::plugins

2
include/engine/plugins/table.hpp
View File

@ -15,7 +15,7 @@ class TablePlugin final : public BasePlugin
{ {
public: public:
explicit TablePlugin(const int max_locations_distance_table, explicit TablePlugin(const int max_locations_distance_table,
const boost::optional<double> default_radius); boost::optional<double> default_radius);
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::TableParameters &params, const api::TableParameters &params,

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

@ -32,10 +32,10 @@ class TripPlugin final : public BasePlugin
const bool roundtrip) const; const bool roundtrip) const;
public: public:
explicit TripPlugin(const int max_locations_trip_, const boost::optional<double> default_radius) explicit TripPlugin(const int max_locations_trip_, boost::optional<double> default_radius)
: max_locations_trip(max_locations_trip_) : BasePlugin(std::move(default_radius))
, max_locations_trip(max_locations_trip_)
{ {
this->default_radius = default_radius;
} }
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,

2
include/engine/plugins/viaroute.hpp
View File

@ -27,7 +27,7 @@ class ViaRoutePlugin final : public BasePlugin
public: public:
explicit ViaRoutePlugin(int max_locations_viaroute, explicit ViaRoutePlugin(int max_locations_viaroute,
int max_alternatives, int max_alternatives,
const boost::optional<double> default_radius); boost::optional<double> default_radius);
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::RouteParameters &route_parameters, const api::RouteParameters &route_parameters,

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

@ -10,10 +10,10 @@
namespace osrm::engine::plugins namespace osrm::engine::plugins
{ {
NearestPlugin::NearestPlugin(const int max_results_, const boost::optional<double> default_radius_) NearestPlugin::NearestPlugin(const int max_results_, boost::optional<double> default_radius_)
: max_results{max_results_} : BasePlugin(std::move(default_radius_))
, max_results{max_results_}
{ {
this->default_radius = default_radius_;
} }
Status NearestPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status NearestPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,

6
src/engine/plugins/table.cpp
View File

@ -15,10 +15,10 @@ namespace osrm::engine::plugins
{ {
TablePlugin::TablePlugin(const int max_locations_distance_table, TablePlugin::TablePlugin(const int max_locations_distance_table,
const boost::optional<double> default_radius) boost::optional<double> default_radius)
: max_locations_distance_table(max_locations_distance_table) : BasePlugin(std::move(default_radius))
, max_locations_distance_table(max_locations_distance_table)
{ {
this->default_radius = default_radius;
} }
Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,

6
src/engine/plugins/viaroute.cpp
View File

@ -17,10 +17,10 @@ namespace osrm::engine::plugins
ViaRoutePlugin::ViaRoutePlugin(int max_locations_viaroute, ViaRoutePlugin::ViaRoutePlugin(int max_locations_viaroute,
int max_alternatives, int max_alternatives,
const boost::optional<double> default_radius) boost::optional<double> default_radius)
: max_locations_viaroute(max_locations_viaroute), max_alternatives(max_alternatives) : BasePlugin(std::move(default_radius))
, max_locations_viaroute(max_locations_viaroute), max_alternatives(max_alternatives)
{ {
this->default_radius = default_radius;
} }
Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms, Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,