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

Address PR comments

Browse Source
This commit is contained in:
Patrick Niklaus 2016-11-02 11:50:16 +00:00 committed by Patrick Niklaus
parent d342a18324
commit b749d9bd2f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/guidance/assemble_overview.cpp
View File

@ -64,8 +64,9 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
auto leg_reverse_index = leg_geometries.size(); auto leg_reverse_index = leg_geometries.size();
const auto insert_without_overlap = [&leg_reverse_index, &overview_geometry](GeometryIter begin, GeometryIter end) { const auto insert_without_overlap = [&leg_reverse_index, &overview_geometry](GeometryIter begin, GeometryIter end) {
// not the last leg // not the last leg
if (--leg_reverse_index > 0) if (leg_reverse_index > 1)
{ {
--leg_reverse_index;
end = std::prev(end); end = std::prev(end);
} }
overview_geometry.insert(overview_geometry.end(), begin, end); overview_geometry.insert(overview_geometry.end(), begin, end);
@ -76,19 +77,15 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
const auto zoom_level = std::min(18u, calculateOverviewZoomLevel(leg_geometries)); const auto zoom_level = std::min(18u, calculateOverviewZoomLevel(leg_geometries));
for (const auto &geometry : leg_geometries) for (const auto &geometry : leg_geometries)
{ {
auto simplified = douglasPeucker(geometry.locations.begin(), geometry.locations.end(), zoom_level); const auto simplified = douglasPeucker(geometry.locations.begin(), geometry.locations.end(), zoom_level);
auto begin = simplified.cbegin(); insert_without_overlap(simplified.begin(), simplified.end());
auto end = simplified.cend();
insert_without_overlap(begin, end);
} }
} }
else else
{ {
for (const auto &geometry : leg_geometries) for (const auto &geometry : leg_geometries)
{ {
auto begin = geometry.locations.begin(); insert_without_overlap(geometry.locations.begin(), geometry.locations.end());
auto end = geometry.locations.end();
insert_without_overlap(begin, end);
} }
} }