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

Fixes issue where two ways with same name but different pronunciation where deduplicated, resolves #2860

Browse Source
This commit is contained in:
Daniel J. Hofmann
2016-09-09 18:28:44 +02:00
parent 05c1fe7f46
commit e6fe9d0d67
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extractor/extractor_callbacks.hpp
+8 -4
View File
@@ -18,14 +18,17 @@ class Way;
namespace std
{
template <> struct hash<std::tuple<std::string, std::string, std::string>>
template <> struct hash<std::tuple<std::string, std::string, std::string, std::string>>
{
std::size_t operator()(const std::tuple<std::string, std::string, std::string> &mk) const noexcept
std::size_t
operator()(const std::tuple<std::string, std::string, std::string, std::string> &mk) const
noexcept
{
std::size_t seed = 0;
boost::hash_combine(seed, std::get<0>(mk));
boost::hash_combine(seed, std::get<1>(mk));
boost::hash_combine(seed, std::get<2>(mk));
boost::hash_combine(seed, std::get<3>(mk));
return seed;
}
};
@@ -51,8 +54,9 @@ struct ExtractionWay;
class ExtractorCallbacks
{
private:
// used to deduplicate street names and street destinations: actually maps to name ids
using MapKey = std::tuple<std::string, std::string, std::string>;
// used to deduplicate street names, refs, destinations, pronunciation: actually maps to name
// ids
using MapKey = std::tuple<std::string, std::string, std::string, std::string>;
using MapVal = unsigned;
std::unordered_map<MapKey, MapVal> string_map;
guidance::LaneDescriptionMap lane_description_map;