From 35422a0fb5cdadd970a1efdbd77cd12565e675d8 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Thu, 28 Jul 2016 22:13:17 -0700 Subject: [PATCH] Clang format. --- include/engine/api/route_api.hpp | 16 +++--- include/engine/geospatial_query.hpp | 55 +++++++++++-------- include/engine/guidance/assemble_geometry.hpp | 13 +++-- 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index df7cb2ee2..0ef32a12a 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -215,14 +215,14 @@ class RouteAPI : public BaseAPI nodes.values.reserve(leg_geometry.osm_node_ids.size()); datasources.values.reserve(leg_geometry.annotations.size()); - std::for_each( - leg_geometry.annotations.begin(), - leg_geometry.annotations.end(), - [this, &durations, &distances, &datasources](const guidance::LegGeometry::Annotation &step) { - durations.values.push_back(step.duration); - distances.values.push_back(step.distance); - datasources.values.push_back(step.datasource); - }); + std::for_each(leg_geometry.annotations.begin(), + leg_geometry.annotations.end(), + [this, &durations, &distances, &datasources]( + const guidance::LegGeometry::Annotation &step) { + durations.values.push_back(step.duration); + distances.values.push_back(step.distance); + datasources.values.push_back(step.datasource); + }); std::for_each(leg_geometry.osm_node_ids.begin(), leg_geometry.osm_node_ids.end(), [this, &nodes](const OSMNodeID &node_id) { diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp index f115b7d96..6a3b27a28 100644 --- a/include/engine/geospatial_query.hpp +++ b/include/engine/geospatial_query.hpp @@ -73,7 +73,8 @@ template class GeospatialQuery auto results = rtree.Nearest( input_coordinate, [this, bearing, bearing_range, max_distance](const CandidateSegment &segment) { - return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range),HasValidEdge(segment)); + return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), + HasValidEdge(segment)); }, [this, max_distance, input_coordinate](const std::size_t, const CandidateSegment &segment) { @@ -91,14 +92,15 @@ template class GeospatialQuery const int bearing, const int bearing_range) const { - auto results = - rtree.Nearest(input_coordinate, - [this, bearing, bearing_range](const CandidateSegment &segment) { - return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), HasValidEdge(segment)); - }, - [max_results](const std::size_t num_results, const CandidateSegment &) { - return num_results >= max_results; - }); + auto results = rtree.Nearest( + input_coordinate, + [this, bearing, bearing_range](const CandidateSegment &segment) { + return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), + HasValidEdge(segment)); + }, + [max_results](const std::size_t num_results, const CandidateSegment &) { + return num_results >= max_results; + }); return MakePhantomNodes(input_coordinate, results); } @@ -113,16 +115,17 @@ template class GeospatialQuery const int bearing, const int bearing_range) const { - auto results = - rtree.Nearest(input_coordinate, - [this, bearing, bearing_range](const CandidateSegment &segment) { - return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), HasValidEdge(segment)); - }, - [this, max_distance, max_results, input_coordinate]( - const std::size_t num_results, const CandidateSegment &segment) { - return num_results >= max_results || - CheckSegmentDistance(input_coordinate, segment, max_distance); - }); + auto results = rtree.Nearest( + input_coordinate, + [this, bearing, bearing_range](const CandidateSegment &segment) { + return boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), + HasValidEdge(segment)); + }, + [this, max_distance, max_results, input_coordinate](const std::size_t num_results, + const CandidateSegment &segment) { + return num_results >= max_results || + CheckSegmentDistance(input_coordinate, segment, max_distance); + }); return MakePhantomNodes(input_coordinate, results); } @@ -214,7 +217,8 @@ template class GeospatialQuery auto use_segment = (!has_small_component || (!has_big_component && !segment.data.component.is_tiny)); auto use_directions = std::make_pair(use_segment, use_segment); - if (!use_directions.first && !use_directions.second) return use_directions; + if (!use_directions.first && !use_directions.second) + return use_directions; const auto valid_edges = HasValidEdge(segment); if (valid_edges.first || valid_edges.second) @@ -259,7 +263,9 @@ template class GeospatialQuery if (use_segment) { - use_directions = boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), HasValidEdge(segment)); + use_directions = + boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), + HasValidEdge(segment)); if (use_directions.first || use_directions.second) { has_big_component = has_big_component || !segment.data.component.is_tiny; @@ -304,7 +310,9 @@ template class GeospatialQuery if (use_segment) { - use_directions = boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), HasValidEdge(segment)); + use_directions = + boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range), + HasValidEdge(segment)); if (use_directions.first || use_directions.second) { has_big_component = has_big_component || !segment.data.component.is_tiny; @@ -490,7 +498,8 @@ template class GeospatialQuery BOOST_ASSERT(segment.data.fwd_segment_position < reverse_weight_vector.size()); - if (reverse_weight_vector[reverse_weight_vector.size() - segment.data.fwd_segment_position - 1] != INVALID_EDGE_WEIGHT) + if (reverse_weight_vector[reverse_weight_vector.size() - + segment.data.fwd_segment_position - 1] != INVALID_EDGE_WEIGHT) { reverse_edge_valid = segment.data.reverse_segment_id.enabled; } diff --git a/include/engine/guidance/assemble_geometry.hpp b/include/engine/guidance/assemble_geometry.hpp index fe6e139d3..fb9e8fa43 100644 --- a/include/engine/guidance/assemble_geometry.hpp +++ b/include/engine/guidance/assemble_geometry.hpp @@ -51,8 +51,8 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade, reverse_geometry[reverse_geometry.size() - source_node.fwd_segment_position - 1])); std::vector forward_datasource_vector; - facade.GetUncompressedDatasources(source_node.forward_packed_geometry_id, forward_datasource_vector); - + facade.GetUncompressedDatasources(source_node.forward_packed_geometry_id, + forward_datasource_vector); auto cumulative_distance = 0.; auto current_distance = 0.; @@ -73,8 +73,8 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade, } prev_coordinate = coordinate; - geometry.annotations.emplace_back( - LegGeometry::Annotation{current_distance, path_point.duration_until_turn / 10., path_point.datasource_id}); + geometry.annotations.emplace_back(LegGeometry::Annotation{ + current_distance, path_point.duration_until_turn / 10., path_point.datasource_id}); geometry.locations.push_back(std::move(coordinate)); geometry.osm_node_ids.push_back(facade.GetOSMNodeIDOfNode(path_point.turn_via_node)); } @@ -88,7 +88,9 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade, facade.GetUncompressedDatasources(target_node.forward_packed_geometry_id, forward_datasources); geometry.annotations.emplace_back( - LegGeometry::Annotation{current_distance, target_node.forward_weight / 10., forward_datasources[target_node.fwd_segment_position]}); + LegGeometry::Annotation{current_distance, + target_node.forward_weight / 10., + forward_datasources[target_node.fwd_segment_position]}); geometry.segment_offsets.push_back(geometry.locations.size()); geometry.locations.push_back(target_node.location); @@ -99,7 +101,6 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade, geometry.osm_node_ids.push_back( facade.GetOSMNodeIDOfNode(forward_geometry[target_node.fwd_segment_position])); - BOOST_ASSERT(geometry.segment_distances.size() == geometry.segment_offsets.size() - 1); BOOST_ASSERT(geometry.locations.size() > geometry.segment_distances.size()); BOOST_ASSERT(geometry.annotations.size() == geometry.locations.size() - 1);