Refactored the verbal text formatter to handle logic for street name and sign #3369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and sign. Simplified code for narrative builder and signs
…rbal_text_formatter_refactor
dgearhart
commented
Oct 25, 2021
| @@ -52,8 +52,7 @@ std::string StreetNames::ToString(uint32_t max_count, | |||
| if (!name_string.empty()) { | |||
| name_string += delim; | |||
| } | |||
| name_string += | |||
| (verbal_formatter) ? verbal_formatter->Format(street_name->value()) : street_name->value(); | |||
| name_string += (verbal_formatter) ? verbal_formatter->Format(street_name) : street_name->value(); | |||
There was a problem hiding this comment.
simplified call to Format
dgearhart
commented
Oct 25, 2021
| // If markup string exists then use it | ||
| if (markup_string) { | ||
| return *markup_string; | ||
| std::string VerbalTextFormatter::Format(const std::unique_ptr<baldr::StreetName>& street_name, |
There was a problem hiding this comment.
handles the formatting logic for street names
dgearhart
commented
Oct 25, 2021
| return verbal_text; | ||
| } | ||
|
|
||
| std::string VerbalTextFormatter::Format(const odin::Sign& sign, |
There was a problem hiding this comment.
handles the formatting logic for signs
dgearhart
commented
Oct 25, 2021
| return VerbalTextFormatter::Format(text, markup_string); | ||
| } | ||
|
|
||
| std::string VerbalTextFormatterUs::Format(const std::string& text) const { |
There was a problem hiding this comment.
simplified and cleaned up
dgearhart
commented
Oct 25, 2021
| return VerbalTextFormatter::Format(text, markup_string); | ||
| } | ||
|
|
||
| std::string VerbalTextFormatterUsTx::Format(const std::string& text) const { |
There was a problem hiding this comment.
simplified and cleaned up
dgearhart
commented
Oct 25, 2021
| @@ -49,7 +49,7 @@ void MarkupFormatter::set_markup_enabled(bool markup_enabled) { | |||
| } | |||
|
|
|||
| boost::optional<std::string> | |||
| MarkupFormatter::Format(const std::unique_ptr<baldr::StreetName>& street_name) const { | |||
| MarkupFormatter::FormatPhonemeElement(const std::unique_ptr<baldr::StreetName>& street_name) const { | |||
There was a problem hiding this comment.
better name for method
dgearhart
commented
Oct 25, 2021
| @@ -66,7 +66,7 @@ MarkupFormatter::Format(const std::unique_ptr<baldr::StreetName>& street_name) c | |||
| return boost::none; | |||
| } | |||
|
|
|||
| boost::optional<std::string> MarkupFormatter::Format(const Sign& sign) const { | |||
| boost::optional<std::string> MarkupFormatter::FormatPhonemeElement(const Sign& sign) const { | |||
There was a problem hiding this comment.
better name for method
dgearhart
commented
Oct 25, 2021
| (verbal_formatter) | ||
| ? verbal_formatter->Format(street_name->value(), markup_formatter_.Format(street_name)) | ||
| : street_name->value(); | ||
| street_names_string += (verbal_formatter) |
There was a problem hiding this comment.
simplified code for street name formatting
dgearhart
commented
Oct 25, 2021
| ((markup_formatter) ? markup_formatter->Format(sign) | ||
| : boost::none)) | ||
| : sign.text(); | ||
| sign_string += |
There was a problem hiding this comment.
simplified code for sign formatting
gknisely
approved these changes
Oct 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Simplified code for narrative builder and signs
Tasklist