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

handle empty names in summaries

Browse Source
This commit is contained in:
karenzshea
2016-09-28 17:41:34 -04:00
committed by Moritz Kobitzsch
parent b033ac9f0b
commit 12238ebb52
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/guidance/assemble_leg.hpp
+11 -10
View File
@@ -6,6 +6,7 @@
#include "engine/guidance/route_leg.hpp"
#include "engine/guidance/route_step.hpp"
#include "engine/internal_route_result.hpp"
#include <boost/algorithm/string/join.hpp>
#include <cstddef>
#include <cstdint>
@@ -177,16 +178,16 @@ inline RouteLeg assembleLeg(const datafacade::BaseDataFacade &facade,
BOOST_ASSERT(detail::MAX_USED_SEGMENTS > 0);
BOOST_ASSERT(summary_array.begin() != summary_array.end());
summary = std::accumulate(std::next(summary_array.begin()),
summary_array.end(),
facade.GetNameForID(summary_array.front()),
[&facade](std::string previous, const std::uint32_t name_id) {
if (name_id != 0)
{
previous += ", " + facade.GetNameForID(name_id);
}
return previous;
});
std::vector<std::string> summary_names;
for (auto nameIt = summary_array.begin(), end = summary_array.end(); nameIt != end; ++nameIt)
{
auto name = facade.GetNameForID(* nameIt);
name = name.empty() ? facade.GetRefForID(* nameIt) : name;
if (!name.empty())
summary_names.push_back(name);
}
BOOST_ASSERT(summary_names.size() =< MAX_USED_SEGMENTS);
summary = boost::algorithm::join(summary_names, ", ");
}
return RouteLeg{duration, distance, summary, {}};