From 2c9edcaf23114656c41a6510069b1582d70adfad Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Fri, 18 Apr 2014 13:54:34 +0200 Subject: [PATCH] remove debug code --- Descriptors/JSONDescriptor.h | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h index 390422c78..e4aad4192 100644 --- a/Descriptors/JSONDescriptor.h +++ b/Descriptors/JSONDescriptor.h @@ -129,22 +129,6 @@ public: return; } - // std::string name = facade->GetEscapedNameForNameID(phantom_nodes.source_phantom.name_id); - int fwd_weight = phantom_nodes.source_phantom.forward_weight; - int rev_weight = phantom_nodes.source_phantom.reverse_weight; - int fwd_offset = phantom_nodes.source_phantom.forward_offset; - int rev_offset = phantom_nodes.source_phantom.reverse_offset; - // SimpleLogger().Write(logDEBUG) << "json source: " << name << ", location: " << phantom_nodes.source_phantom.location << ", fwd_weight: " << fwd_weight << ", fwd_offset: " << fwd_offset << ", rev_weight: " << rev_weight << ", rev_offset: " << rev_offset; - // name = facade->GetEscapedNameForNameID(phantom_nodes.target_phantom.name_id); - fwd_weight = phantom_nodes.target_phantom.forward_weight; - rev_weight = phantom_nodes.target_phantom.reverse_weight; - fwd_offset = phantom_nodes.target_phantom.forward_offset; - rev_offset = phantom_nodes.target_phantom.reverse_offset; - // SimpleLogger().Write(logDEBUG) << "json target: " << name << ", location: " << phantom_nodes.target_phantom.location << ", fwd_weight: " << fwd_weight << ", fwd_offset: " << fwd_offset << ", rev_weight: " << rev_weight << ", rev_offset: " << rev_offset; - - - //TODO: replace the previous logic with this one. - //check if first segment is non-zero std::string road_name; int source_duration = phantom_nodes.source_phantom.GetForwardWeightPlusOffset(); @@ -155,29 +139,18 @@ public: } BOOST_ASSERT(source_duration >= 0); road_name = facade->GetEscapedNameForNameID(phantom_nodes.source_phantom.name_id); - // if (source_duration > 0) - // { - // SimpleLogger().Write(logDEBUG) << "adding source \"" << road_name << "\" at " << phantom_nodes.source_phantom.location << ", duration: " << source_duration; - // } - // else - // { - // SimpleLogger().Write(logDEBUG) << "ignoring source \"" << road_name << "\""; - // } - // TODO, for each unpacked segment add the leg to the description + // for each unpacked segment add the leg to the description BOOST_ASSERT( raw_route.unpacked_path_segments.size() == raw_route.segmentEndCoordinates.size() ); for (unsigned i = 0; i < raw_route.unpacked_path_segments.size(); ++i) { const std::vector & leg_path = raw_route.unpacked_path_segments[i]; - // const PhantomNodes & leg_phantoms = raw_route.segmentEndCoordinates[i]; - // SimpleLogger().Write(logDEBUG) << " Describing leg from " << leg_phantoms.source_phantom.location << " and " << leg_phantoms.target_phantom.location; FixedPointCoordinate current_coordinate; BOOST_FOREACH(const PathData & path_data, leg_path) { current_coordinate = facade->GetCoordinateOfNode(path_data.node); road_name = facade->GetEscapedNameForNameID(path_data.name_id); - // SimpleLogger().Write(logDEBUG) << " adding way point for \"" << road_name << "\" at " << current_coordinate << ", duration: " << path_data.durationOfSegment; } }