From b749d9bd2f224fe1b93ccd0352693d597e97f884 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Wed, 2 Nov 2016 11:50:16 +0000 Subject: [PATCH] Address PR comments --- src/engine/guidance/assemble_overview.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/engine/guidance/assemble_overview.cpp b/src/engine/guidance/assemble_overview.cpp index d0729bc99..33921be04 100644 --- a/src/engine/guidance/assemble_overview.cpp +++ b/src/engine/guidance/assemble_overview.cpp @@ -64,8 +64,9 @@ std::vector assembleOverview(const std::vector &l auto leg_reverse_index = leg_geometries.size(); const auto insert_without_overlap = [&leg_reverse_index, &overview_geometry](GeometryIter begin, GeometryIter end) { // not the last leg - if (--leg_reverse_index > 0) + if (leg_reverse_index > 1) { + --leg_reverse_index; end = std::prev(end); } overview_geometry.insert(overview_geometry.end(), begin, end); @@ -76,19 +77,15 @@ std::vector assembleOverview(const std::vector &l const auto zoom_level = std::min(18u, calculateOverviewZoomLevel(leg_geometries)); for (const auto &geometry : leg_geometries) { - auto simplified = douglasPeucker(geometry.locations.begin(), geometry.locations.end(), zoom_level); - auto begin = simplified.cbegin(); - auto end = simplified.cend(); - insert_without_overlap(begin, end); + const auto simplified = douglasPeucker(geometry.locations.begin(), geometry.locations.end(), zoom_level); + insert_without_overlap(simplified.begin(), simplified.end()); } } else { for (const auto &geometry : leg_geometries) { - auto begin = geometry.locations.begin(); - auto end = geometry.locations.end(); - insert_without_overlap(begin, end); + insert_without_overlap(geometry.locations.begin(), geometry.locations.end()); } }