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

Add support for a default-bearing-radius flag

Browse Source
This commit is contained in:
whytro 2023-03-20 00:35:24 +09:00
parent 192d077ada
commit 2f40a47529
14 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/engine/engine.hpp
View File

@ -43,11 +43,11 @@ template <typename Algorithm> class Engine final : public EngineInterface
{
public:
explicit Engine(const EngineConfig &config)
: route_plugin(config.max_locations_viaroute, config.max_alternatives), //
table_plugin(config.max_locations_distance_table), //
nearest_plugin(config.max_results_nearest), //
trip_plugin(config.max_locations_trip), //
match_plugin(config.max_locations_map_matching, config.max_radius_map_matching), //
: route_plugin(config.max_locations_viaroute, config.max_alternatives, config.default_bearing_radius), //
table_plugin(config.max_locations_distance_table, config.default_bearing_radius), //
nearest_plugin(config.max_results_nearest, config.default_bearing_radius), //
trip_plugin(config.max_locations_trip, config.default_bearing_radius), //
match_plugin(config.max_locations_map_matching, config.max_radius_map_matching, config.default_bearing_radius), //
tile_plugin() //
{

1
include/engine/engine_config.hpp
View File

@ -83,6 +83,7 @@ struct EngineConfig final
int max_locations_map_matching = -1;
double max_radius_map_matching = -1.0;
int max_results_nearest = -1;
boost::optional<double> default_bearing_radius;
int max_alternatives = 3; // set an arbitrary upper bound; can be adjusted by user
bool use_shared_memory = true;
boost::filesystem::path memory_file;

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

@ -20,10 +20,11 @@ class MatchPlugin : public BasePlugin
using CandidateLists = routing_algorithms::CandidateLists;
static const constexpr double RADIUS_MULTIPLIER = 3;
MatchPlugin(const int max_locations_map_matching, const double max_radius_map_matching)
MatchPlugin(const int max_locations_map_matching, const double max_radius_map_matching, const boost::optional<double> default_bearing_radius)
: max_locations_map_matching(max_locations_map_matching),
max_radius_map_matching(max_radius_map_matching)
{
this->default_bearing_radius = default_bearing_radius;
}
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
{
public:
explicit NearestPlugin(const int max_results);
explicit NearestPlugin(const int max_results, const boost::optional<double> default_bearing_radius);
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::NearestParameters &params,

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

@ -237,7 +237,7 @@ class BasePlugin
phantom_nodes[i] = facade.NearestPhantomNodes(
parameters.coordinates[i],
number_of_results,
use_radiuses ? parameters.radiuses[i] : boost::none,
use_radiuses ? parameters.radiuses[i] : default_bearing_radius,
use_bearings ? parameters.bearings[i] : boost::none,
use_approaches && parameters.approaches[i] ? parameters.approaches[i].get()
: engine::Approach::UNRESTRICTED);
@ -279,7 +279,7 @@ class BasePlugin
alternatives[i] = facade.NearestCandidatesWithAlternativeFromBigComponent(
parameters.coordinates[i],
use_radiuses ? parameters.radiuses[i] : boost::none,
use_radiuses ? parameters.radiuses[i] : default_bearing_radius,
use_bearings ? parameters.bearings[i] : boost::none,
use_approaches && parameters.approaches[i] ? parameters.approaches[i].get()
: engine::Approach::UNRESTRICTED,
@ -320,6 +320,8 @@ class BasePlugin
return std::string("Could not find a matching segment for coordinate ") +
std::to_string(missing_index);
}
boost::optional<double> default_bearing_radius;
};
} // namespace osrm::engine::plugins

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

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

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

@ -32,7 +32,9 @@ class TripPlugin final : public BasePlugin
const bool roundtrip) const;
public:
explicit TripPlugin(const int max_locations_trip_) : max_locations_trip(max_locations_trip_) {}
explicit TripPlugin(const int max_locations_trip_, const boost::optional<double> default_bearing_radius) : max_locations_trip(max_locations_trip_) {
this->default_bearing_radius = default_bearing_radius;
}
Status HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::TripParameters &parameters,

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

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

8
include/nodejs/node_osrm_support.hpp
View File

@ -285,6 +285,7 @@ inline engine_config_ptr argumentsToEngineConfig(const Napi::CallbackInfo &args)
auto max_results_nearest = params.Get("max_results_nearest");
auto max_alternatives = params.Get("max_alternatives");
auto max_radius_map_matching = params.Get("max_radius_map_matching");
auto default_bearing_radius = params.Get("default_bearing_radius");
if (!max_locations_trip.IsUndefined() && !max_locations_trip.IsNumber())
{
@ -316,6 +317,11 @@ inline engine_config_ptr argumentsToEngineConfig(const Napi::CallbackInfo &args)
ThrowError(args.Env(), "max_alternatives must be an integral number");
return engine_config_ptr();
}
if (!default_bearing_radius.IsUndefined() && !default_bearing_radius.IsNumber())
{
ThrowError(args.Env(), "default_bearing_radius must be an integral number");
return engine_config_ptr();
}
if (max_locations_trip.IsNumber())
engine_config->max_locations_trip = max_locations_trip.ToNumber().Int32Value();
@ -333,6 +339,8 @@ inline engine_config_ptr argumentsToEngineConfig(const Napi::CallbackInfo &args)
engine_config->max_alternatives = max_alternatives.ToNumber().Int32Value();
if (max_radius_map_matching.IsNumber())
engine_config->max_radius_map_matching = max_radius_map_matching.ToNumber().DoubleValue();
if (default_bearing_radius.IsNumber())
engine_config->default_bearing_radius = default_bearing_radius.ToNumber().DoubleValue();
return engine_config;
}

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

@ -10,7 +10,9 @@
namespace osrm::engine::plugins
{
NearestPlugin::NearestPlugin(const int max_results_) : max_results{max_results_} {}
NearestPlugin::NearestPlugin(const int max_results_, const boost::optional<double> default_bearing_radius_) : max_results{max_results_} {
this->default_bearing_radius = default_bearing_radius_;
}
Status NearestPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
const api::NearestParameters &params,

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

@ -14,9 +14,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_bearing_radius)
: max_locations_distance_table(max_locations_distance_table)
{
this->default_bearing_radius = default_bearing_radius;
}
Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,

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

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

5
src/tools/routed.cpp
View File

@ -147,7 +147,10 @@ inline unsigned generateServerProgramOptions(const int argc,
"Max. number of alternatives supported in the MLD route query") //
("max-matching-radius",
value<double>(&config.max_radius_map_matching)->default_value(-1.0),
"Max. radius size supported in map matching query. Default: unlimited.");
"Max. radius size supported in map matching query. Default: unlimited.") //
("default-bearings-radius",
value<boost::optional<double>>(&config.default_bearing_radius),
"Default radius size for queries with bearings. Default: unlimited.");
// hidden options, will be allowed on command line, but will not be shown to the user
boost::program_options::options_description hidden_options("Hidden options");

6
test/nodejs/index.js
View File

@ -112,6 +112,12 @@ test('constructor: throws if dataset_name is not a string', function(assert) {
assert.throws(function() { new OSRM({dataset_name: "unsued_name___", shared_memory: true}); }, /Could not find shared memory region/, 'Does not accept wrong name');
});
test('constructor: takes a default_bearing_radius argument', function(assert) {
assert.plan(1);
var osrm = new OSRM({default_bearing_radius: 1});
assert.ok(osrm);
});
test('constructor: parses custom limits', function(assert) {
assert.plan(1);
var osrm = new OSRM({