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

Make max_results non-optional

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-05-15 17:42:08 +02:00
parent 0a0ebc1934
commit 2d04112e24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/engine/geospatial_query.hpp
View File

@ -82,7 +82,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
std::vector<PhantomNodeWithDistance> std::vector<PhantomNodeWithDistance>
NearestPhantomNodes(const util::Coordinate input_coordinate, NearestPhantomNodes(const util::Coordinate input_coordinate,
const Approach approach, const Approach approach,
const boost::optional<size_t> max_results, const size_t max_results,
const boost::optional<double> max_distance, const boost::optional<double> max_distance,
const boost::optional<Bearing> bearing_with_range, const boost::optional<Bearing> bearing_with_range,
const boost::optional<bool> use_all_edges) const const boost::optional<bool> use_all_edges) const
@ -100,10 +100,10 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
: std::make_pair(true, true)); : std::make_pair(true, true));
return valid; return valid;
}, },
[this, &max_distance, &max_results, input_coordinate](const std::size_t num_results, [this, &max_distance, max_results, input_coordinate](const std::size_t num_results,
const CandidateSegment &segment) const CandidateSegment &segment)
{ {
return (max_results && num_results >= *max_results) || return (num_results >= max_results) ||
(max_distance && max_distance != -1.0 && (max_distance && max_distance != -1.0 &&
CheckSegmentDistance(input_coordinate, segment, *max_distance)); CheckSegmentDistance(input_coordinate, segment, *max_distance));
}); });