Skip to content

Commit 58b98cf

Browse files
committed
Smarter search radius formula for map matching
1 parent fead71d commit 58b98cf

File tree

3 files changed

+43
-10
lines changed

3 files changed

+43
-10
lines changed

include/engine/api/match_parameters.hpp

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#ifndef ENGINE_API_MATCH_PARAMETERS_HPP
2929
#define ENGINE_API_MATCH_PARAMETERS_HPP
3030

31+
#define SEARCH_RADIUS_BASE_DEFAULT 45
32+
#define SEARCH_RADIUS_BASE_LIMIT 100
33+
#define SEARCH_RADIUS_MULTIPLIER_DEFAULT 3.5
34+
#define SEARCH_RADIUS_MULTIPLIER_LIMIT 10
35+
#define SEARCH_RADIUS_MAX_DEFAULT 200
36+
#define SEARCH_RADIUS_MAX_LIMIT 500
37+
3138
#include "engine/api/route_parameters.hpp"
3239

3340
#include <vector>
@@ -67,10 +74,20 @@ struct MatchParameters : public RouteParameters
6774
}
6875

6976
std::vector<unsigned> timestamps;
77+
78+
double search_radius_base = SEARCH_RADIUS_BASE_DEFAULT;
79+
double search_radius_multiplier = SEARCH_RADIUS_MULTIPLIER_DEFAULT;
80+
double search_radius_max = SEARCH_RADIUS_MAX_DEFAULT;
81+
7082
bool IsValid() const
7183
{
7284
return RouteParameters::IsValid() &&
73-
(timestamps.empty() || timestamps.size() == coordinates.size());
85+
(timestamps.empty() || timestamps.size() == coordinates.size()) &&
86+
search_radius_base >= 0 && search_radius_multiplier >= 0 && search_radius_max > 0 &&
87+
// limit the search_radius parameters to sane values to prevent overloading the server
88+
search_radius_base <= SEARCH_RADIUS_BASE_LIMIT &&
89+
search_radius_multiplier <= SEARCH_RADIUS_MULTIPLIER_LIMIT &&
90+
search_radius_max <= SEARCH_RADIUS_MAX_LIMIT;
7491
}
7592
};
7693
}

include/server/api/match_parameter_grammar.hpp

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,33 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
3333
(qi::uint_ %
3434
';')[ph::bind(&engine::api::MatchParameters::timestamps, qi::_r1) = qi::_1];
3535

36+
search_radius_base_rule =
37+
qi::lit("search_radius_base=") > qi::double_[
38+
ph::bind(&engine::api::MatchParameters::search_radius_base, qi::_r1) = qi::_1];
39+
40+
search_radius_multiplier_rule =
41+
qi::lit("search_radius_multiplier=") > qi::double_[
42+
ph::bind(&engine::api::MatchParameters::search_radius_multiplier, qi::_r1) = qi::_1];
43+
44+
search_radius_max_rule =
45+
qi::lit("search_radius_max=") > qi::double_[
46+
ph::bind(&engine::api::MatchParameters::search_radius_max, qi::_r1) = qi::_1];
47+
3648
root_rule = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
37-
-('?' > (timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) % '&');
49+
-('?' > (timestamps_rule(qi::_r1) |
50+
search_radius_base_rule(qi::_r1) |
51+
search_radius_multiplier_rule(qi::_r1) |
52+
search_radius_max_rule(qi::_r1) |
53+
BaseGrammar::base_rule(qi::_r1))
54+
% '&');
3855
}
3956

4057
private:
4158
qi::rule<Iterator, Signature> root_rule;
4259
qi::rule<Iterator, Signature> timestamps_rule;
60+
qi::rule<Iterator, Signature> search_radius_base_rule;
61+
qi::rule<Iterator, Signature> search_radius_multiplier_rule;
62+
qi::rule<Iterator, Signature> search_radius_max_rule;
4363
};
4464
}
4565
}

src/engine/plugins/match.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,11 @@ Status MatchPlugin::HandleRequest(const std::shared_ptr<datafacade::BaseDataFaca
139139
parameters.radiuses.end(),
140140
search_radiuses.begin(),
141141
[](const boost::optional<double> &maybe_radius) {
142-
if (maybe_radius)
143-
{
144-
return *maybe_radius * RADIUS_MULTIPLIER;
145-
}
146-
else
147-
{
148-
return DEFAULT_GPS_PRECISION * RADIUS_MULTIPLIER;
149-
}
142+
double in_radius = maybe_radius ? *maybe_radius : DEFAULT_GPS_PRECISION;
150143

144+
return std::min(
145+
in_radius * parameters.search_radius_multiplier + parameters.search_radius_base,
146+
parameters.search_radius_max);
151147
});
152148
}
153149

0 commit comments

Comments
 (0)