From 237d7942d85f9b57fa6d9b0bb7b8232411f386f4 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Wed, 31 Aug 2022 22:43:33 +0200 Subject: [PATCH] Deprecate .osrm file --- src/extractor/extraction_containers.cpp | 9 +++++++-- src/extractor/extractor.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index 5c1b57c18..2cb0a06c3 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -883,7 +883,10 @@ void ExtractionContainers::WriteNodes(storage::tar::FileWriter &writer) BOOST_ASSERT(*node_id_iterator == node_iterator->node_id); ++node_id_iterator; - return *node_iterator++; + auto result = *node_iterator++; + + internal_nodes.push_back(result); + return result; }; writer.WriteElementCount64("/extractor/nodes", used_node_id_list.size()); @@ -909,7 +912,9 @@ void ExtractionContainers::WriteNodes(storage::tar::FileWriter &writer) internal_barrier_nodes.emplace(node_id); } } - // storage::serialization::write(writer, "/extractor/barriers", internal_barrier_nodes); + std::vector barrier_nodes_vector(internal_barrier_nodes.begin(), + internal_barrier_nodes.end()); + storage::serialization::write(writer, "/extractor/barriers", barrier_nodes_vector); log << "ok, after " << TIMER_SEC(write_nodes) << "s"; } diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index fe2d26bce..bf84de177 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -657,16 +657,16 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment, std::vector edge_list; std::vector annotation_data; - osm_coordinates.resize(extraction_containers.all_nodes_list.size()); - osm_node_ids.reserve(extraction_containers.all_nodes_list.size()); - for (size_t index = 0; index < extraction_containers.all_nodes_list.size(); ++index) + osm_coordinates.resize(extraction_containers.internal_nodes.size()); + osm_node_ids.reserve(extraction_containers.internal_nodes.size()); + for (size_t index = 0; index < extraction_containers.internal_nodes.size(); ++index) { - const auto ¤t_node = extraction_containers.all_nodes_list[index]; + const auto ¤t_node = extraction_containers.internal_nodes[index]; osm_coordinates[index].lon = current_node.lon; osm_coordinates[index].lat = current_node.lat; osm_node_ids.push_back(current_node.node_id); } - + return std::make_tuple(std::move(turn_lane_map), std::move(extraction_containers.turn_restrictions), std::move(extraction_containers.internal_maneuver_overrides),