[skip ci] Fix formating using format.sh
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -81,10 +81,10 @@ inline HSGRHeader readHSGRHeader(boost::filesystem::ifstream &input_stream)
|
||||
using NodeT = typename util::StaticGraph<contractor::QueryEdge::EdgeData>::NodeArrayEntry;
|
||||
using EdgeT = typename util::StaticGraph<contractor::QueryEdge::EdgeData>::EdgeArrayEntry;
|
||||
inline void readHSGR(boost::filesystem::ifstream &input_stream,
|
||||
NodeT *node_buffer,
|
||||
const std::uint64_t number_of_nodes,
|
||||
EdgeT *edge_buffer,
|
||||
const std::uint64_t number_of_edges)
|
||||
NodeT *node_buffer,
|
||||
const std::uint64_t number_of_nodes,
|
||||
EdgeT *edge_buffer,
|
||||
const std::uint64_t number_of_edges)
|
||||
{
|
||||
BOOST_ASSERT(node_buffer);
|
||||
BOOST_ASSERT(edge_buffer);
|
||||
@@ -177,7 +177,6 @@ void readNodes(boost::filesystem::ifstream &nodes_input_stream,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Reads datasource names out of .datasource_names files and metadata such as
|
||||
// the length and offset of each name
|
||||
struct DatasourceNamesData
|
||||
@@ -186,7 +185,8 @@ struct DatasourceNamesData
|
||||
std::vector<std::size_t> offsets;
|
||||
std::vector<std::size_t> lengths;
|
||||
};
|
||||
inline DatasourceNamesData readDatasourceNames(boost::filesystem::ifstream &datasource_names_input_stream)
|
||||
inline DatasourceNamesData
|
||||
readDatasourceNames(boost::filesystem::ifstream &datasource_names_input_stream)
|
||||
{
|
||||
DatasourceNamesData datasource_names_data;
|
||||
std::string name;
|
||||
@@ -215,7 +215,6 @@ void readRamIndex(boost::filesystem::ifstream &ram_index_input_stream,
|
||||
ram_index_input_stream.read(reinterpret_cast<char *>(rtree_buffer),
|
||||
sizeof(RTreeNodeT) * tree_size);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,14 +23,8 @@ struct SharedBarriers
|
||||
{
|
||||
boost::interprocess::named_sharable_mutex::remove("current_regions");
|
||||
}
|
||||
static void resetRegions1()
|
||||
{
|
||||
boost::interprocess::named_sharable_mutex::remove("regions_1");
|
||||
}
|
||||
static void resetRegions2()
|
||||
{
|
||||
boost::interprocess::named_sharable_mutex::remove("regions_2");
|
||||
}
|
||||
static void resetRegions1() { boost::interprocess::named_sharable_mutex::remove("regions_1"); }
|
||||
static void resetRegions2() { boost::interprocess::named_sharable_mutex::remove("regions_2"); }
|
||||
|
||||
boost::interprocess::named_upgradable_mutex current_regions_mutex;
|
||||
boost::interprocess::named_sharable_mutex regions_1_mutex;
|
||||
|
||||
@@ -147,7 +147,6 @@ NodeID loadEdgesFromFile(std::istream &input_stream,
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user