Clang formatting.
This commit is contained in:
parent
e9c0987e8a
commit
69422cc4e7
@ -63,13 +63,17 @@ struct MatchParameters : public RouteParameters
|
|||||||
false,
|
false,
|
||||||
RouteParameters::GeometriesType::Polyline,
|
RouteParameters::GeometriesType::Polyline,
|
||||||
RouteParameters::OverviewType::Simplified,
|
RouteParameters::OverviewType::Simplified,
|
||||||
{}), track_preprocessing(PreprocessingType::Simple)
|
{}),
|
||||||
|
track_preprocessing(PreprocessingType::Simple)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
MatchParameters(std::vector<unsigned> timestamps_, PreprocessingType track_preprocessing_, Args... args_)
|
MatchParameters(std::vector<unsigned> timestamps_,
|
||||||
: RouteParameters{std::forward<Args>(args_)...}, timestamps{std::move(timestamps_)}, track_preprocessing(track_preprocessing_)
|
PreprocessingType track_preprocessing_,
|
||||||
|
Args... args_)
|
||||||
|
: RouteParameters{std::forward<Args>(args_)...}, timestamps{std::move(timestamps_)},
|
||||||
|
track_preprocessing(track_preprocessing_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,8 +80,8 @@ template <typename AlgorithmT> class RoutingAlgorithms final : public RoutingAlg
|
|||||||
const std::vector<std::size_t> &source_indices,
|
const std::vector<std::size_t> &source_indices,
|
||||||
const std::vector<std::size_t> &target_indices) const final override;
|
const std::vector<std::size_t> &target_indices) const final override;
|
||||||
|
|
||||||
routing_algorithms::SubMatchingList MapMatching(
|
routing_algorithms::SubMatchingList
|
||||||
const routing_algorithms::CandidateLists &candidates_list,
|
MapMatching(const routing_algorithms::CandidateLists &candidates_list,
|
||||||
const std::vector<util::Coordinate> &trace_coordinates,
|
const std::vector<util::Coordinate> &trace_coordinates,
|
||||||
const std::vector<unsigned> &trace_timestamps,
|
const std::vector<unsigned> &trace_timestamps,
|
||||||
const std::vector<boost::optional<double>> &trace_gps_precision,
|
const std::vector<boost::optional<double>> &trace_gps_precision,
|
||||||
@ -168,8 +168,13 @@ inline routing_algorithms::SubMatchingList RoutingAlgorithms<AlgorithmT>::MapMat
|
|||||||
const std::vector<boost::optional<double>> &trace_gps_precision,
|
const std::vector<boost::optional<double>> &trace_gps_precision,
|
||||||
const bool use_tidying) const
|
const bool use_tidying) const
|
||||||
{
|
{
|
||||||
return routing_algorithms::mapMatching(
|
return routing_algorithms::mapMatching(heaps,
|
||||||
heaps, facade, candidates_list, trace_coordinates, trace_timestamps, trace_gps_precision, use_tidying);
|
facade,
|
||||||
|
candidates_list,
|
||||||
|
trace_coordinates,
|
||||||
|
trace_timestamps,
|
||||||
|
trace_gps_precision,
|
||||||
|
use_tidying);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename AlgorithmT>
|
template <typename AlgorithmT>
|
||||||
|
@ -37,11 +37,14 @@ struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Si
|
|||||||
"full", engine::api::MatchParameters::PreprocessingType::Full)(
|
"full", engine::api::MatchParameters::PreprocessingType::Full)(
|
||||||
"false", engine::api::MatchParameters::PreprocessingType::False);
|
"false", engine::api::MatchParameters::PreprocessingType::False);
|
||||||
|
|
||||||
|
root_rule =
|
||||||
root_rule = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
|
BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json") >
|
||||||
-('?' > (timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1) | (
|
-('?' >
|
||||||
qi::lit("preprocess=") > preprocessing_type[ph::bind(&engine::api::MatchParameters::track_preprocessing, qi::_r1) = qi::_1])
|
(timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1) |
|
||||||
) % '&');
|
(qi::lit("preprocess=") >
|
||||||
|
preprocessing_type[ph::bind(&engine::api::MatchParameters::track_preprocessing,
|
||||||
|
qi::_r1) = qi::_1])) %
|
||||||
|
'&');
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
Reference in New Issue
Block a user