From 7149547645317341b642a08be12372ce667953cf Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Sun, 30 Oct 2022 20:10:09 +0100 Subject: [PATCH] Fix formatting --- include/util/guidance/name_announcements.hpp | 24 ++++++++++---------- unit_tests/engine/offline_facade.cpp | 20 ++++++++++++---- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/util/guidance/name_announcements.hpp b/include/util/guidance/name_announcements.hpp index 06639310d..83f604144 100644 --- a/include/util/guidance/name_announcements.hpp +++ b/include/util/guidance/name_announcements.hpp @@ -131,19 +131,19 @@ inline bool requiresNameAnnounced(const StringView &from_name, const auto name_is_contained = boost::starts_with(from_name, to_name) || boost::starts_with(to_name, from_name); - const auto checkForPrefixOrSuffixChange = - [](const std::string_view &first, const std::string_view &second, const SuffixTable &suffix_table) { - std::string first_prefix, first_suffix, second_prefix, second_suffix; - std::tie(first_prefix, first_suffix, second_prefix, second_suffix) = - decompose(first, second); - - const auto checkTable = [&](const std::string &str) { - return str.empty() || suffix_table.isSuffix(str); - }; - - return checkTable(first_prefix) && checkTable(first_suffix) && - checkTable(second_prefix) && checkTable(second_suffix); + const auto checkForPrefixOrSuffixChange = [](const std::string_view &first, + const std::string_view &second, + const SuffixTable &suffix_table) { + std::string first_prefix, first_suffix, second_prefix, second_suffix; + std::tie(first_prefix, first_suffix, second_prefix, second_suffix) = + decompose(first, second); + const auto checkTable = [&](const std::string &str) { + return str.empty() || suffix_table.isSuffix(str); }; + + 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 names_are_equal = from_name == to_name || name_is_contained || is_suffix_change; diff --git a/unit_tests/engine/offline_facade.cpp b/unit_tests/engine/offline_facade.cpp index df30dc9a4..afe1c7253 100644 --- a/unit_tests/engine/offline_facade.cpp +++ b/unit_tests/engine/offline_facade.cpp @@ -203,7 +203,10 @@ class ContiguousInternalMemoryDataFacade 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 { @@ -272,9 +275,18 @@ class ContiguousInternalMemoryDataFacade 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 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 GetDestinationsForID(const NameID /*id*/) const override { return std::string_view{}; } - std::string_view GetExitsForID(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 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; } std::string GetTimestamp() const override { return ""; } double GetMapMatchingMaxSpeed() const override { return 0; }