[skip ci] Fix formating using format.sh

This commit is contained in:
Patrick Niklaus
2016-10-28 14:45:05 -07:00
parent 9435254661
commit f02b7b0910
12 changed files with 45 additions and 41 deletions
+1 -2
View File
@@ -74,8 +74,7 @@ util::json::Object makeGeoJSONGeometry(ForwardIter begin, ForwardIter end)
util::json::Object makeStepManeuver(const guidance::StepManeuver &maneuver);
util::json::Object makeRouteStep(guidance::RouteStep step,
util::json::Value geometry);
util::json::Object makeRouteStep(guidance::RouteStep step, util::json::Value geometry);
util::json::Object makeRoute(const guidance::Route &route,
util::json::Array legs,
@@ -17,8 +17,8 @@
#include "util/guidance/turn_lanes.hpp"
#include "engine/geospatial_query.hpp"
#include "util/packed_vector.hpp"
#include "util/guidance/turn_bearing.hpp"
#include "util/packed_vector.hpp"
#include "util/range_table.hpp"
#include "util/rectangle.hpp"
#include "util/simple_logger.hpp"
+2 -1
View File
@@ -31,7 +31,8 @@ class ViaRoutePlugin final : public BasePlugin
mutable SearchEngineData heaps;
mutable routing_algorithms::ShortestPathRouting<datafacade::BaseDataFacade> shortest_path;
mutable routing_algorithms::AlternativeRouting<datafacade::BaseDataFacade> alternative_path;
mutable routing_algorithms::DirectShortestPathRouting<datafacade::BaseDataFacade> direct_shortest_path;
mutable routing_algorithms::DirectShortestPathRouting<datafacade::BaseDataFacade>
direct_shortest_path;
const int max_locations_viaroute;
public:
@@ -843,8 +843,7 @@ class AlternativeRouting final
const NodeID via_path_middle_node_id = current_edge_data.id;
const EdgeID second_segment_edge_id =
facade.FindEdgeInEitherDirection(via_path_middle_node_id, via_path_edge.second);
const int second_segment_length =
facade.GetEdgeData(second_segment_edge_id).weight;
const int second_segment_length = facade.GetEdgeData(second_segment_edge_id).weight;
// attention: !unpacking in reverse!
// Check if second segment is the one to go over treshold? if yes add second segment
// to stack, else push first segment to stack and add weight of second one.