diff --git a/Descriptors/DescriptionFactory.cpp b/Descriptors/DescriptionFactory.cpp index 9e84e3be8..2b8b41a71 100644 --- a/Descriptors/DescriptionFactory.cpp +++ b/Descriptors/DescriptionFactory.cpp @@ -60,6 +60,9 @@ double DescriptionFactory::GetBearing(const FixedPointCoordinate & A, const Fixe { result -= 360.; } + + SimpleLogger().Write(logDEBUG) << "bearing between " << A << " and " << B << " is " << result; + return result; } @@ -100,26 +103,18 @@ void DescriptionFactory::SetEndSegment(const PhantomNode & target, const bool ta ); } -void DescriptionFactory::AppendSegment( - const FixedPointCoordinate & coordinate, - const PathData & data -) { - // if( - // ( 1 == pathDescription.size()) && - // ( pathDescription.back().location == coordinate) - // ) { - // pathDescription.back().name_id = data.name_id; - // } else { - pathDescription.push_back( - SegmentInformation( - coordinate, - data.name_id, - data.durationOfSegment, - 0, - data.turnInstruction - ) - ); - // } +void DescriptionFactory::AppendSegment(const FixedPointCoordinate & coordinate, const PathData & path_point) +{ + if ((1 == pathDescription.size()) && ( pathDescription.back().location == coordinate)) + { + pathDescription.back().name_id = path_point.name_id; + } + else + { + pathDescription.push_back( + SegmentInformation(coordinate, path_point.name_id, path_point.durationOfSegment, 0, path_point.turnInstruction) + ); + } } void DescriptionFactory::AppendEncodedPolylineString( diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h index e011b2cd2..08e1cfb87 100644 --- a/Descriptors/DescriptionFactory.h +++ b/Descriptors/DescriptionFactory.h @@ -187,8 +187,6 @@ public: pathDescription.back().turn_instruction = TurnInstructionsClass::NoTurn; target_phantom.name_id = (pathDescription.end()-2)->name_id; } - } else { - // pathDescription[segment_start_index].duration *= (1.-target_phantom.ratio); } if(std::numeric_limits::epsilon() > pathDescription[0].length) { if(pathDescription.size() > 2) { @@ -197,8 +195,6 @@ public: pathDescription[0].necessary = true; start_phantom.name_id = pathDescription[0].name_id; } - } else { - // pathDescription[0].duration *= start_phantom.ratio; } //Generalize poly line