Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the turn and continue phrases to include junction names and guide signs #2386

Merged
merged 15 commits into from May 22, 2020

Conversation

dgearhart
Copy link
Member

@dgearhart dgearhart commented May 20, 2020

Issue

Updated the following phrases to include junction names and guide signs

  1. bear
  2. bear_verbal
  3. continue
  4. continue_verbal
  5. continue_verbal_alert
  6. sharp
  7. sharp_verbal
  8. turn
  9. turn_verbal
  10. uturn
  11. uturn_verbal

Example#1 junction name

< BEFORE
< 2: Turn right. 
> AFTER
> 2: Turn right at 万年橋東.

Example#2 junction name

< BEFORE
< 2: Turn left onto 晴海通り/304/Harumi-dori.
> AFTER
> 2: Turn left at 万年橋東.

Example#3 junction name

< BEFORE
< 2: Make a right U-turn at みゆき通り/Miyuki-dori onto 15/中央通り/旧東海道/Chuo-dori Avenue.
> AFTER
> 2: Make a right U-turn at 銀座五丁目.

Example#4 guide signs

< BEFORE
< 2: Turn right onto Forstenrieder Straße/St 2344.
<    VERBAL_ALERT: Turn right onto Forstenrieder Straße.
<    VERBAL_PRE: Turn right onto Forstenrieder Straße, St 23 44. Then You will arrive at Forstenrieder Straße.
> AFTER
> 2: Turn right toward A 95/München.
>    VERBAL_ALERT: Turn right toward A 95.
>    VERBAL_PRE: Turn right toward A 95, München. Then You will arrive at Forstenrieder Straße.

Example#5 guide signs

< BEFORE
< 2: Bear right.
<    VERBAL_ALERT: Bear right.
<    VERBAL_PRE: Bear right.
> AFTER
> 2: Bear right toward Hersheypark/Arena/Stadium/Giant Center.
>    VERBAL_ALERT: Bear right toward Hersheypark.
>    VERBAL_PRE: Bear right toward Hersheypark, Arena.

Impacts 20% of routes

Tasklist

  • RAD tests
  • Add gurka tests
  • Add pinpoint tests
  • Add #fixes with the issue number that this PR addresses
  • Generally use squash merge to rebase and clean comments before merging
  • Update the changelog

Requirements / Relations

Link any requirements here. Other pull requests this PR is based on?

@dgearhart dgearhart self-assigned this May 20, 2020
mandeepsandhu
mandeepsandhu previously approved these changes May 20, 2020
Copy link
Collaborator

@danpaz danpaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some questions. LGTM.

*(next_man->mutable_signs()) = curr_man->signs();
}
// NOTE: Do not copy signs from internal maneuver
// It would produce invalid results
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you expand on this note? Was there a bug that this fixed?

Copy link
Member Author

@dgearhart dgearhart May 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danpaz Found during RAD testing - when people incorrectly tag internal edges with sign info - therefore, it led to an incorrect turn toward phrase. Created gurka test to make sure we do not see in the future

std::string guide_sign;

if (maneuver.HasGuideSign()) {
// Set the toward phrase - it takes priority over street names and junction name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting we may want to revisit the priority ordering of GuideSign > JunctionName > StreetName at some point. Also it may be preferable to announce JunctionName and GuideSign together Turn left at X toward Y. No change needed for this PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking the same possibility but kept to the current plan for now

Copy link
Contributor

@mandeepsandhu mandeepsandhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@dgearhart dgearhart merged commit d70b8ff into master May 22, 2020
@dgearhart dgearhart deleted the junction_name branch May 22, 2020 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants