Revert "Hardcode search radius parameters"

This reverts commit 2c9e18d5a9.
This commit is contained in:
Patrick Niklaus
2016-12-20 23:34:15 +00:00
committed by Daniel Patterson
parent c5e3fa916f
commit cc14fb8bff
3 changed files with 44 additions and 12 deletions
+21 -1
View File
@@ -33,13 +33,33 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
(qi::uint_ %
';')[ph::bind(&engine::api::MatchParameters::timestamps, qi::_r1) = qi::_1];
search_radius_base_rule =
qi::lit("search_radius_base=") > qi::double_[
ph::bind(&engine::api::MatchParameters::search_radius_base, qi::_r1) = qi::_1];
search_radius_multiplier_rule =
qi::lit("search_radius_multiplier=") > qi::double_[
ph::bind(&engine::api::MatchParameters::search_radius_multiplier, qi::_r1) = qi::_1];
search_radius_max_rule =
qi::lit("search_radius_max=") > qi::double_[
ph::bind(&engine::api::MatchParameters::search_radius_max, qi::_r1) = qi::_1];
root_rule = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
-('?' > (timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) % '&');
-('?' > (timestamps_rule(qi::_r1) |
search_radius_base_rule(qi::_r1) |
search_radius_multiplier_rule(qi::_r1) |
search_radius_max_rule(qi::_r1) |
BaseGrammar::base_rule(qi::_r1))
% '&');
}
private:
qi::rule<Iterator, Signature> root_rule;
qi::rule<Iterator, Signature> timestamps_rule;
qi::rule<Iterator, Signature> search_radius_base_rule;
qi::rule<Iterator, Signature> search_radius_multiplier_rule;
qi::rule<Iterator, Signature> search_radius_max_rule;
};
}
}