From 469c3331e4834ffd7f57cd2d231eaf9145782c57 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Sat, 2 Feb 2019 22:15:16 -0800 Subject: [PATCH] Fix formatting. --- include/engine/geospatial_query.hpp | 16 ++++++++++++---- include/nodejs/node_osrm_support.hpp | 9 ++++----- src/engine/plugins/viaroute.cpp | 5 ++++- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp index bac91a566..67e2b3b69 100644 --- a/include/engine/geospatial_query.hpp +++ b/include/engine/geospatial_query.hpp @@ -212,8 +212,12 @@ template class GeospatialQuery bool has_big_component = false; auto results = rtree.Nearest( input_coordinate, - [this, approach, &input_coordinate, &has_big_component, &has_small_component, &use_all_edges]( - const CandidateSegment &segment) { + [this, + approach, + &input_coordinate, + &has_big_component, + &has_small_component, + &use_all_edges](const CandidateSegment &segment) { auto use_segment = (!has_small_component || (!has_big_component && !IsTinyComponent(segment))); auto use_directions = std::make_pair(use_segment, use_segment); @@ -259,8 +263,12 @@ template class GeospatialQuery bool has_big_component = false; auto results = rtree.Nearest( input_coordinate, - [this, approach, &input_coordinate, &has_big_component, &has_small_component, &use_all_edges]( - const CandidateSegment &segment) { + [this, + approach, + &input_coordinate, + &has_big_component, + &has_small_component, + &use_all_edges](const CandidateSegment &segment) { auto use_segment = (!has_small_component || (!has_big_component && !IsTinyComponent(segment))); auto use_directions = std::make_pair(use_segment, use_segment); diff --git a/include/nodejs/node_osrm_support.hpp b/include/nodejs/node_osrm_support.hpp index d99c43e92..2696a4c22 100644 --- a/include/nodejs/node_osrm_support.hpp +++ b/include/nodejs/node_osrm_support.hpp @@ -1014,16 +1014,15 @@ argumentsToRouteParameter(const Nan::FunctionCallbackInfo &args, { v8::Local snapping = obj->Get(Nan::New("snapping").ToLocalChecked()); if (snapping.IsEmpty()) - return route_parameters_ptr(); + return route_parameters_ptr(); if (!snapping->IsString()) { Nan::ThrowError("Snapping must be a string: [default, any]"); - return route_parameters_ptr(); + return route_parameters_ptr(); } const Nan::Utf8String snapping_utf8str(snapping); - std::string snapping_str{*snapping_utf8str, - *snapping_utf8str + snapping_utf8str.length()}; + std::string snapping_str{*snapping_utf8str, *snapping_utf8str + snapping_utf8str.length()}; if (snapping_str == "default") { @@ -1036,7 +1035,7 @@ argumentsToRouteParameter(const Nan::FunctionCallbackInfo &args, else { Nan::ThrowError("'snapping' param must be one of [default, any]"); - return route_parameters_ptr(); + return route_parameters_ptr(); } } diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp index 992a62c0d..f21449375 100644 --- a/src/engine/plugins/viaroute.cpp +++ b/src/engine/plugins/viaroute.cpp @@ -87,7 +87,10 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm return Status::Error; const auto &facade = algorithms.GetFacade(); - auto phantom_node_pairs = GetPhantomNodes(facade, route_parameters, (route_parameters.snapping == api::RouteParameters::SnappingType::Any)); + auto phantom_node_pairs = + GetPhantomNodes(facade, + route_parameters, + (route_parameters.snapping == api::RouteParameters::SnappingType::Any)); if (phantom_node_pairs.size() != route_parameters.coordinates.size()) { return Error("NoSegment",