Skip to content

Commit 1c42a49

Browse files
daniel-j-hdaniel-j-h
committed
Runs clang-format-3.8 on all changesets
1 parent ae9b697 commit 1c42a49

File tree

11 files changed

+103
-59
lines changed

11 files changed

+103
-59
lines changed

‎include/engine/geospatial_query.hpp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
7171
const int bearing,
7272
const int bearing_range) const
7373
{
74-
if (bearing_range == 0) return {};
74+
if (bearing_range == 0)
75+
return {};
7576
auto results = rtree.Nearest(
7677
input_coordinate,
7778
[this, bearing, bearing_range, max_distance](const CandidateSegment &segment) {
@@ -94,7 +95,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
9495
const int bearing,
9596
const int bearing_range) const
9697
{
97-
if (bearing_range == 0) return {};
98+
if (bearing_range == 0)
99+
return {};
98100
auto results = rtree.Nearest(
99101
input_coordinate,
100102
[this, bearing, bearing_range](const CandidateSegment &segment) {
@@ -118,7 +120,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
118120
const int bearing,
119121
const int bearing_range) const
120122
{
121-
if (bearing_range == 0) return {};
123+
if (bearing_range == 0)
124+
return {};
122125
auto results = rtree.Nearest(
123126
input_coordinate,
124127
[this, bearing, bearing_range](const CandidateSegment &segment) {
@@ -139,7 +142,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
139142
std::vector<PhantomNodeWithDistance>
140143
NearestPhantomNodes(const util::Coordinate input_coordinate, const unsigned max_results) const
141144
{
142-
if (max_results == 0) return {};
145+
if (max_results == 0)
146+
return {};
143147
auto results =
144148
rtree.Nearest(input_coordinate,
145149
[this](const CandidateSegment &segment) { return HasValidEdge(segment); },
@@ -157,7 +161,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
157161
const unsigned max_results,
158162
const double max_distance) const
159163
{
160-
if (max_results == 0) return {};
164+
if (max_results == 0)
165+
return {};
161166
auto results =
162167
rtree.Nearest(input_coordinate,
163168
[this](const CandidateSegment &segment) { return HasValidEdge(segment); },
@@ -256,7 +261,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
256261
std::pair<PhantomNode, PhantomNode> NearestPhantomNodeWithAlternativeFromBigComponent(
257262
const util::Coordinate input_coordinate, const int bearing, const int bearing_range) const
258263
{
259-
if (bearing_range == 0) return {};
264+
if (bearing_range == 0)
265+
return {};
260266
bool has_small_component = false;
261267
bool has_big_component = false;
262268
auto results = rtree.Nearest(
@@ -304,7 +310,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
304310
const int bearing,
305311
const int bearing_range) const
306312
{
307-
if (bearing_range == 0) return {};
313+
if (bearing_range == 0)
314+
return {};
308315
bool has_small_component = false;
309316
bool has_big_component = false;
310317
auto results = rtree.Nearest(

‎include/engine/plugins/match.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ class MatchPlugin : public BasePlugin
2727
static const constexpr double DEFAULT_GPS_PRECISION = 5;
2828
static const constexpr double RADIUS_MULTIPLIER = 3;
2929

30-
MatchPlugin(datafacade::BaseDataFacade &facade_, const int max_locations_map_matching,
30+
MatchPlugin(datafacade::BaseDataFacade &facade_,
31+
const int max_locations_map_matching,
3132
const double max_radius_when_bearings_)
32-
: BasePlugin(facade_, max_radius_when_bearings_), map_matching(&facade_, heaps, DEFAULT_GPS_PRECISION),
33-
shortest_path(&facade_, heaps), max_locations_map_matching(max_locations_map_matching)
33+
: BasePlugin(facade_, max_radius_when_bearings_),
34+
map_matching(&facade_, heaps, DEFAULT_GPS_PRECISION), shortest_path(&facade_, heaps),
35+
max_locations_map_matching(max_locations_map_matching)
3436
{
3537
}
3638

‎include/engine/plugins/plugin_base.hpp

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#include "engine/api/base_parameters.hpp"
55
#include "engine/datafacade/datafacade_base.hpp"
6+
#include "engine/engine_config.hpp"
67
#include "engine/phantom_node.hpp"
78
#include "engine/status.hpp"
8-
#include "engine/engine_config.hpp"
99

1010
#include "util/coordinate.hpp"
1111
#include "util/coordinate_calculation.hpp"
@@ -29,7 +29,10 @@ class BasePlugin
2929
protected:
3030
datafacade::BaseDataFacade &facade;
3131
const double max_radius_when_bearings;
32-
BasePlugin(datafacade::BaseDataFacade &facade_, const double max_radius_when_bearings_) : facade(facade_), max_radius_when_bearings(max_radius_when_bearings_) {}
32+
BasePlugin(datafacade::BaseDataFacade &facade_, const double max_radius_when_bearings_)
33+
: facade(facade_), max_radius_when_bearings(max_radius_when_bearings_)
34+
{
35+
}
3336

3437
bool CheckAllCoordinates(const std::vector<util::Coordinate> &coordinates)
3538
{
@@ -41,15 +44,16 @@ class BasePlugin
4144

4245
bool CheckAllRadiuses(const api::BaseParameters &parameters)
4346
{
44-
if (parameters.bearings.empty()) return true;
47+
if (parameters.bearings.empty())
48+
return true;
4549

46-
if (max_radius_when_bearings == EngineConfig::UNLIMITED) return true;
50+
if (max_radius_when_bearings == EngineConfig::UNLIMITED)
51+
return true;
4752

4853
return !std::any_of(
49-
std::begin(parameters.radiuses), std::end(parameters.radiuses),
50-
[this](const auto &radius) {
51-
return radius && *radius > max_radius_when_bearings;
52-
});
54+
std::begin(parameters.radiuses),
55+
std::end(parameters.radiuses),
56+
[this](const auto &radius) { return radius && *radius > max_radius_when_bearings; });
5357
}
5458

5559
Status Error(const std::string &code,
@@ -150,11 +154,13 @@ class BasePlugin
150154
}
151155
if (use_bearings && parameters.bearings[i])
152156
{
153-
phantom_nodes[i] =
154-
facade.NearestPhantomNodesInRange(parameters.coordinates[i],
155-
max_radius_when_bearings != EngineConfig::UNLIMITED ? std::min(radiuses[i], max_radius_when_bearings) : radiuses[i],
156-
parameters.bearings[i]->bearing,
157-
parameters.bearings[i]->range);
157+
phantom_nodes[i] = facade.NearestPhantomNodesInRange(
158+
parameters.coordinates[i],
159+
max_radius_when_bearings != EngineConfig::UNLIMITED
160+
? std::min(radiuses[i], max_radius_when_bearings)
161+
: radiuses[i],
162+
parameters.bearings[i]->bearing,
163+
parameters.bearings[i]->range);
158164
}
159165
else
160166
{
@@ -194,28 +200,33 @@ class BasePlugin
194200
{
195201
if (use_radiuses && parameters.radiuses[i])
196202
{
197-
phantom_nodes[i] = facade.NearestPhantomNodes(parameters.coordinates[i],
198-
number_of_results,
199-
max_radius_when_bearings != EngineConfig::UNLIMITED ? std::min(*parameters.radiuses[i],max_radius_when_bearings) : *parameters.radiuses[i],
200-
parameters.bearings[i]->bearing,
201-
parameters.bearings[i]->range);
203+
phantom_nodes[i] = facade.NearestPhantomNodes(
204+
parameters.coordinates[i],
205+
number_of_results,
206+
max_radius_when_bearings != EngineConfig::UNLIMITED
207+
? std::min(*parameters.radiuses[i], max_radius_when_bearings)
208+
: *parameters.radiuses[i],
209+
parameters.bearings[i]->bearing,
210+
parameters.bearings[i]->range);
202211
}
203212
else
204213
{
205214
if (max_radius_when_bearings != EngineConfig::UNLIMITED)
206215
{
207-
phantom_nodes[i] = facade.NearestPhantomNodes(parameters.coordinates[i],
208-
number_of_results,
209-
parameters.bearings[i]->bearing,
210-
parameters.bearings[i]->range);
216+
phantom_nodes[i] =
217+
facade.NearestPhantomNodes(parameters.coordinates[i],
218+
number_of_results,
219+
parameters.bearings[i]->bearing,
220+
parameters.bearings[i]->range);
211221
}
212222
else
213223
{
214-
phantom_nodes[i] = facade.NearestPhantomNodes(parameters.coordinates[i],
215-
number_of_results,
216-
max_radius_when_bearings,
217-
parameters.bearings[i]->bearing,
218-
parameters.bearings[i]->range);
224+
phantom_nodes[i] =
225+
facade.NearestPhantomNodes(parameters.coordinates[i],
226+
number_of_results,
227+
max_radius_when_bearings,
228+
parameters.bearings[i]->bearing,
229+
parameters.bearings[i]->range);
219230
}
220231
}
221232
}
@@ -268,7 +279,9 @@ class BasePlugin
268279
phantom_node_pairs[i] =
269280
facade.NearestPhantomNodeWithAlternativeFromBigComponent(
270281
parameters.coordinates[i],
271-
max_radius_when_bearings != EngineConfig::UNLIMITED ? std::min(*parameters.radiuses[i],max_radius_when_bearings) : *parameters.radiuses[i],
282+
max_radius_when_bearings != EngineConfig::UNLIMITED
283+
? std::min(*parameters.radiuses[i], max_radius_when_bearings)
284+
: *parameters.radiuses[i],
272285
parameters.bearings[i]->bearing,
273286
parameters.bearings[i]->range);
274287
}

‎src/engine/engine.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,16 @@ Engine::Engine(EngineConfig &config)
144144
// Register plugins
145145
using namespace plugins;
146146

147-
route_plugin = create<ViaRoutePlugin>(*query_data_facade, config.max_locations_viaroute, config.max_radius_when_bearings);
148-
table_plugin = create<TablePlugin>(*query_data_facade, config.max_locations_distance_table, config.max_radius_when_bearings);
149-
nearest_plugin = create<NearestPlugin>(*query_data_facade, config.max_results_nearest, config.max_radius_when_bearings);
150-
trip_plugin = create<TripPlugin>(*query_data_facade, config.max_locations_trip, config.max_radius_when_bearings);
151-
match_plugin = create<MatchPlugin>(*query_data_facade, config.max_locations_map_matching, config.max_radius_when_bearings);
147+
route_plugin = create<ViaRoutePlugin>(
148+
*query_data_facade, config.max_locations_viaroute, config.max_radius_when_bearings);
149+
table_plugin = create<TablePlugin>(
150+
*query_data_facade, config.max_locations_distance_table, config.max_radius_when_bearings);
151+
nearest_plugin = create<NearestPlugin>(
152+
*query_data_facade, config.max_results_nearest, config.max_radius_when_bearings);
153+
trip_plugin = create<TripPlugin>(
154+
*query_data_facade, config.max_locations_trip, config.max_radius_when_bearings);
155+
match_plugin = create<MatchPlugin>(
156+
*query_data_facade, config.max_locations_map_matching, config.max_radius_when_bearings);
152157
tile_plugin = create<TilePlugin>(*query_data_facade);
153158
}
154159

‎src/engine/plugins/match.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ Status MatchPlugin::HandleRequest(const api::MatchParameters &parameters,
125125

126126
if (!CheckAllRadiuses(parameters))
127127
{
128-
return Error("TooBig", "When using a bearing filter, the maximum search radius is limited to " + std::to_string(max_radius_when_bearings) + "m", json_result);
128+
return Error("TooBig",
129+
"When using a bearing filter, the maximum search radius is limited to " +
130+
std::to_string(max_radius_when_bearings) + "m",
131+
json_result);
129132
}
130133

131134
// assuming radius is the standard deviation of a normal distribution

‎src/engine/plugins/nearest.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <cstddef>
88
#include <string>
99

10-
#include <boost/algorithm/clamp.hpp>
1110
#include <boost/assert.hpp>
1211

1312
namespace osrm
@@ -39,12 +38,17 @@ Status NearestPlugin::HandleRequest(const api::NearestParameters &params,
3938

4039
if (max_results != -1 && params.number_of_results > boost::numeric_cast<unsigned>(max_results))
4140
{
42-
return Error("TooBig", "Too many results requested, maximum is " + std::to_string(max_results), json_result);
41+
return Error("TooBig",
42+
"Too many results requested, maximum is " + std::to_string(max_results),
43+
json_result);
4344
}
4445

4546
if (!CheckAllRadiuses(params))
4647
{
47-
return Error("TooBig", "When using a bearing filter, the maximum search radius is limited to " + std::to_string(max_radius_when_bearings) + "m", json_result);
48+
return Error("TooBig",
49+
"When using a bearing filter, the maximum search radius is limited to " +
50+
std::to_string(max_radius_when_bearings) + "m",
51+
json_result);
4852
}
4953

5054
auto phantom_nodes = GetPhantomNodes(params, params.number_of_results);

‎src/engine/plugins/table.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ namespace engine
2323
namespace plugins
2424
{
2525

26-
TablePlugin::TablePlugin(datafacade::BaseDataFacade &facade, const int max_locations_distance_table, const double max_radius_when_bearings_)
26+
TablePlugin::TablePlugin(datafacade::BaseDataFacade &facade,
27+
const int max_locations_distance_table,
28+
const double max_radius_when_bearings_)
2729
: BasePlugin{facade, max_radius_when_bearings_}, distance_table(&facade, heaps),
2830
max_locations_distance_table(max_locations_distance_table)
2931
{
@@ -60,7 +62,10 @@ Status TablePlugin::HandleRequest(const api::TableParameters &params, util::json
6062

6163
if (!CheckAllRadiuses(params))
6264
{
63-
return Error("TooBig", "When using a bearing filter, the maximum search radius is limited to " + std::to_string(max_radius_when_bearings) + "m", result);
65+
return Error("TooBig",
66+
"When using a bearing filter, the maximum search radius is limited to " +
67+
std::to_string(max_radius_when_bearings) + "m",
68+
result);
6469
}
6570

6671
auto snapped_phantoms = SnapPhantomNodes(GetPhantomNodes(params));

‎src/engine/plugins/trip.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
159159

160160
if (!CheckAllRadiuses(parameters))
161161
{
162-
return Error("TooBig", "When using a bearing filter, the maximum search radius is limited to " + std::to_string(max_radius_when_bearings) + "m", json_result);
162+
return Error("TooBig",
163+
"When using a bearing filter, the maximum search radius is limited to " +
164+
std::to_string(max_radius_when_bearings) + "m",
165+
json_result);
163166
}
164167

165168
auto phantom_node_pairs = GetPhantomNodes(parameters);

‎src/engine/plugins/viaroute.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ namespace engine
2121
namespace plugins
2222
{
2323

24-
ViaRoutePlugin::ViaRoutePlugin(datafacade::BaseDataFacade &facade_, const int max_locations_viaroute, const double max_radius_when_bearings_)
25-
: BasePlugin(facade_, max_radius_when_bearings_), shortest_path(&facade_, heaps), alternative_path(&facade_, heaps),
26-
direct_shortest_path(&facade_, heaps), max_locations_viaroute(max_locations_viaroute)
24+
ViaRoutePlugin::ViaRoutePlugin(datafacade::BaseDataFacade &facade_,
25+
const int max_locations_viaroute,
26+
const double max_radius_when_bearings_)
27+
: BasePlugin(facade_, max_radius_when_bearings_), shortest_path(&facade_, heaps),
28+
alternative_path(&facade_, heaps), direct_shortest_path(&facade_, heaps),
29+
max_locations_viaroute(max_locations_viaroute)
2730
{
2831
}
2932

@@ -49,7 +52,10 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter
4952

5053
if (!CheckAllRadiuses(route_parameters))
5154
{
52-
return Error("TooBig", "When using a bearing filter, the maximum search radius is limited to " + std::to_string(max_radius_when_bearings) + "m", json_result);
55+
return Error("TooBig",
56+
"When using a bearing filter, the maximum search radius is limited to " +
57+
std::to_string(max_radius_when_bearings) + "m",
58+
json_result);
5359
}
5460

5561
auto phantom_node_pairs = GetPhantomNodes(route_parameters);

‎unit_tests/library/fixture.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ inline osrm::OSRM getOSRM(const std::string &base_path)
2323
return getOSRM(base_path, config);
2424
}
2525

26-
2726
#endif

‎unit_tests/library/limits.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include "args.hpp"
66

7-
#include "osrm/nearest_parameters.hpp"
87
#include "osrm/match_parameters.hpp"
8+
#include "osrm/nearest_parameters.hpp"
99
#include "osrm/route_parameters.hpp"
1010
#include "osrm/table_parameters.hpp"
1111
#include "osrm/trip_parameters.hpp"
@@ -174,9 +174,6 @@ BOOST_AUTO_TEST_CASE(test_nearest_limits)
174174
BOOST_REQUIRE(rc2 == Status::Error);
175175
const auto code2 = result2.values.at("code").get<json::String>().value;
176176
BOOST_CHECK_EQUAL(code2, "TooBig");
177-
178177
}
179178

180-
181-
182179
BOOST_AUTO_TEST_SUITE_END()

0 commit comments

Comments
 (0)