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

Fix formatting

Browse Source
This commit is contained in:
Dennis Luxen 2022-10-30 20:10:09 +01:00
parent 565959b389
commit 7149547645
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/util/guidance/name_announcements.hpp
View File

@ -131,19 +131,19 @@ inline bool requiresNameAnnounced(const StringView &from_name,
const auto name_is_contained = const auto name_is_contained =
boost::starts_with(from_name, to_name) || boost::starts_with(to_name, from_name); boost::starts_with(from_name, to_name) || boost::starts_with(to_name, from_name);
const auto checkForPrefixOrSuffixChange = const auto checkForPrefixOrSuffixChange = [](const std::string_view &first,
[](const std::string_view &first, const std::string_view &second, const SuffixTable &suffix_table) { const std::string_view &second,
std::string first_prefix, first_suffix, second_prefix, second_suffix; const SuffixTable &suffix_table) {
std::tie(first_prefix, first_suffix, second_prefix, second_suffix) = std::string first_prefix, first_suffix, second_prefix, second_suffix;
decompose(first, second); std::tie(first_prefix, first_suffix, second_prefix, second_suffix) =
decompose(first, second);
const auto checkTable = [&](const std::string &str) { const auto checkTable = [&](const std::string &str) {
return str.empty() || suffix_table.isSuffix(str); return str.empty() || suffix_table.isSuffix(str);
};
return checkTable(first_prefix) && checkTable(first_suffix) &&
checkTable(second_prefix) && checkTable(second_suffix);
}; };
return checkTable(first_prefix) && checkTable(first_suffix) && checkTable(second_prefix) &&
checkTable(second_suffix);
};
const auto is_suffix_change = checkForPrefixOrSuffixChange(from_name, to_name, suffix_table); const auto is_suffix_change = checkForPrefixOrSuffixChange(from_name, to_name, suffix_table);
const auto names_are_equal = from_name == to_name || name_is_contained || is_suffix_change; const auto names_are_equal = from_name == to_name || name_is_contained || is_suffix_change;

20
unit_tests/engine/offline_facade.cpp
View File

@ -203,7 +203,10 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
return DatasourceReverseRange(DatasourceForwardRange()); return DatasourceReverseRange(DatasourceForwardRange());
} }
std::string_view GetDatasourceName(const DatasourceID /*id*/) const override { return std::string_view{}; } std::string_view GetDatasourceName(const DatasourceID /*id*/) const override
{
return std::string_view{};
}
guidance::TurnInstruction GetTurnInstructionForEdgeID(const EdgeID /*id*/) const override guidance::TurnInstruction GetTurnInstructionForEdgeID(const EdgeID /*id*/) const override
{ {
@ -272,9 +275,18 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
NameID GetNameIndex(const NodeID /*nodeID*/) const override { return EMPTY_NAMEID; } NameID GetNameIndex(const NodeID /*nodeID*/) const override { return EMPTY_NAMEID; }
std::string_view GetNameForID(const NameID /*id*/) const override { return std::string_view{}; } std::string_view GetNameForID(const NameID /*id*/) const override { return std::string_view{}; }
std::string_view GetRefForID(const NameID /*id*/) const override { return std::string_view{}; } std::string_view GetRefForID(const NameID /*id*/) const override { return std::string_view{}; }
std::string_view GetPronunciationForID(const NameID /*id*/) const override { return std::string_view{}; } std::string_view GetPronunciationForID(const NameID /*id*/) const override
std::string_view GetDestinationsForID(const NameID /*id*/) const override { return std::string_view{}; } {
std::string_view GetExitsForID(const NameID /*id*/) const override { return std::string_view{}; } return std::string_view{};
}
std::string_view GetDestinationsForID(const NameID /*id*/) const override
{
return std::string_view{};
}
std::string_view GetExitsForID(const NameID /*id*/) const override
{
return std::string_view{};
}
bool GetContinueStraightDefault() const override { return false; } bool GetContinueStraightDefault() const override { return false; }
std::string GetTimestamp() const override { return ""; } std::string GetTimestamp() const override { return ""; }
double GetMapMatchingMaxSpeed() const override { return 0; } double GetMapMatchingMaxSpeed() const override { return 0; }