From d4d2d127d11a26d734659cd31b91af4643d162f7 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Thu, 28 Aug 2014 19:40:59 +0200 Subject: [PATCH] pass an rvalue of a parsed node into the external memory storage --- Extractor/ExtractorCallbacks.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index dd57250c2..775afabcc 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -51,14 +51,13 @@ ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers &extraction_containe void ExtractorCallbacks::ProcessNode(const osmium::Node &osm_input_node, const ExtractionNode &result_node) { - // TODO: use in-place c'tion - ExternalMemoryNode node; - node.bollard = result_node.barrier; - node.trafficLight = result_node.traffic_lights; - node.lat = osm_input_node.location().lat() * COORDINATE_PRECISION; - node.lon = osm_input_node.location().lon() * COORDINATE_PRECISION; - node.node_id = osm_input_node.id(); - external_memory.all_nodes_list.push_back(node); + external_memory.all_nodes_list.push_back({ + static_cast(osm_input_node.location().lat() * COORDINATE_PRECISION), + static_cast(osm_input_node.location().lon() * COORDINATE_PRECISION), + static_cast(osm_input_node.id()), + result_node.barrier, + result_node.traffic_lights + }); } void ExtractorCallbacks::ProcessRestriction(