Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Deprecate .osrm file

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-08-31 22:43:33 +02:00
parent c8abeb0093
commit 237d7942d8
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/extractor/extraction_containers.cpp
View File

@ -883,7 +883,10 @@ void ExtractionContainers::WriteNodes(storage::tar::FileWriter &writer)
BOOST_ASSERT(*node_id_iterator == node_iterator->node_id); BOOST_ASSERT(*node_id_iterator == node_iterator->node_id);
++node_id_iterator; ++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()); 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); internal_barrier_nodes.emplace(node_id);
} }
} }
// storage::serialization::write(writer, "/extractor/barriers", internal_barrier_nodes); std::vector<NodeID> 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"; log << "ok, after " << TIMER_SEC(write_nodes) << "s";
} }

10
src/extractor/extractor.cpp
View File

@ -657,16 +657,16 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
std::vector<NodeBasedEdge> edge_list; std::vector<NodeBasedEdge> edge_list;
std::vector<NodeBasedEdgeAnnotation> annotation_data; std::vector<NodeBasedEdgeAnnotation> annotation_data;
osm_coordinates.resize(extraction_containers.all_nodes_list.size()); osm_coordinates.resize(extraction_containers.internal_nodes.size());
osm_node_ids.reserve(extraction_containers.all_nodes_list.size()); osm_node_ids.reserve(extraction_containers.internal_nodes.size());
for (size_t index = 0; index < extraction_containers.all_nodes_list.size(); ++index) for (size_t index = 0; index < extraction_containers.internal_nodes.size(); ++index)
{ {
const auto &current_node = extraction_containers.all_nodes_list[index]; const auto &current_node = extraction_containers.internal_nodes[index];
osm_coordinates[index].lon = current_node.lon; osm_coordinates[index].lon = current_node.lon;
osm_coordinates[index].lat = current_node.lat; osm_coordinates[index].lat = current_node.lat;
osm_node_ids.push_back(current_node.node_id); osm_node_ids.push_back(current_node.node_id);
} }
return std::make_tuple(std::move(turn_lane_map), return std::make_tuple(std::move(turn_lane_map),
std::move(extraction_containers.turn_restrictions), std::move(extraction_containers.turn_restrictions),
std::move(extraction_containers.internal_maneuver_overrides), std::move(extraction_containers.internal_maneuver_overrides),