Pull turn data up into server
This commit is contained in:
committed by
Patrick Niklaus
parent
d7e1c9c09c
commit
97d1de1beb
@@ -1,8 +1,8 @@
|
||||
#include "extractor/edge_based_graph_factory.hpp"
|
||||
#include "extractor/edge_based_edge.hpp"
|
||||
#include "extractor/files.hpp"
|
||||
#include "extractor/guidance/turn_analysis.hpp"
|
||||
#include "extractor/guidance/turn_lane_handler.hpp"
|
||||
#include "extractor/files.hpp"
|
||||
#include "extractor/scripting_environment.hpp"
|
||||
#include "extractor/suffix_table.hpp"
|
||||
|
||||
|
||||
@@ -512,7 +512,8 @@ Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
|
||||
});
|
||||
|
||||
WriteTurnLaneData(config.turn_lane_descriptions_file_name);
|
||||
files::writeSegmentData(config.geometry_output_path, *compressed_edge_container.ToSegmentData());
|
||||
files::writeSegmentData(config.geometry_output_path,
|
||||
*compressed_edge_container.ToSegmentData());
|
||||
|
||||
edge_based_graph_factory.GetEdgeBasedEdges(edge_based_edge_list);
|
||||
edge_based_graph_factory.GetEdgeBasedNodes(node_based_edge_list);
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#include "updater/csv_source.hpp"
|
||||
|
||||
#include "extractor/files.hpp"
|
||||
#include "extractor/compressed_edge_container.hpp"
|
||||
#include "extractor/edge_based_graph_factory.hpp"
|
||||
#include "extractor/seralization.hpp"
|
||||
#include "extractor/files.hpp"
|
||||
#include "extractor/node_based_edge.hpp"
|
||||
#include "extractor/seralization.hpp"
|
||||
|
||||
#include "storage/io.hpp"
|
||||
|
||||
@@ -515,12 +515,11 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
|
||||
updated_segments.resize(offset + updated_turn_penalties.size());
|
||||
// we need to re-compute all edges that have updated turn penalties.
|
||||
// this marks it for re-computation
|
||||
std::transform(updated_turn_penalties.begin(),
|
||||
updated_turn_penalties.end(),
|
||||
updated_segments.begin() + offset,
|
||||
[&turn_data](const std::uint64_t turn_id) {
|
||||
return turn_data.GetGeometryID(turn_id);
|
||||
});
|
||||
std::transform(
|
||||
updated_turn_penalties.begin(),
|
||||
updated_turn_penalties.end(),
|
||||
updated_segments.begin() + offset,
|
||||
[&turn_data](const std::uint64_t turn_id) { return turn_data.GetGeometryID(turn_id); });
|
||||
}
|
||||
|
||||
tbb::parallel_sort(updated_segments.begin(),
|
||||
|
||||
Reference in New Issue
Block a user