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.

Sign up for GitHub

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

Jump to bottom

Landmark Routing 6 PR: Update narrative generation with landmarks #4301

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Landmark Routing 6 PR: Update narrative generation with landmarks #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3bf1d1f
update locales with landmark name and landmark type
vesperlou Sep 19, 2023
3b5c08a
update narrative generation to add landmarks, and update test
vesperlou Sep 19, 2023
05e346d
address code reviews, update uturn instruction with landmarks, and re…
vesperlou Sep 20, 2023
78f15a7
update Changelog and code cleaning
vesperlou Sep 20, 2023
b13a0d3
spell
vesperlou Sep 20, 2023
9e78ff3
fix previous bugs: fix incorrect offset increment when name info is n…
vesperlou Sep 21, 2023
2f914b0
fix valhalla_add_landmarks
nilsnolde Sep 22, 2023
fc07d9b
Merge branch 'master' into landmark_narrative
nilsnolde Feb 12, 2024
0c7374a
gurka_landmarks is warning-free
nilsnolde Feb 12, 2024
584eaa6
resolve conflict
kevinkreiser Feb 19, 2024
8067a10
Merge branch 'landmark_narrative' of github.com:valhalla/valhalla int…
nilsnolde Feb 19, 2024
978bfb1
add a failing test, adding landmarks should not shrink the tiles
kevinkreiser Feb 19, 2024
6657259
add correct test but its not failing yet. real world does fail need t…
kevinkreiser Feb 19, 2024
7ebc5fd
Merge branch 'master' into landmark_narrative
nilsnolde Mar 23, 2024
9b4ee2b
Merge branch 'landmark_narrative' of github.com:valhalla/valhalla int…
nilsnolde Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
* ADDED: matrix second pass for connections not found in the first pass, analogous to /route [#4536](https://github.com/valhalla/valhalla/pull/4536)
* UPDATED: cxxopts to 3.1.1 [#4541](https://github.com/valhalla/valhalla/pull/4541)
* CHANGED: make use of vendored libraries optional (other than libraries which are not commonly in package managers or only used for testing) [#4544](https://github.com/valhalla/valhalla/pull/4544)
* ADDED: update maneuver types and narrative generation to support the use of landmarks in phrases, specially for `turn`, `bear`, `sharp`, and `uturn` instructions [#4301](https://github.com/valhalla/valhalla/pull/4301)
* ADDED: Improved instructions for blind users [#3694](https://github.com/valhalla/valhalla/pull/3694)
* FIXED: Fixed roundoff issue in Tiles Row and Col methods [#4585](https://github.com/valhalla/valhalla/pull/4585)
* ADDED: isochrone proper polygon support & pbf output for isochrone [#4575](https://github.com/valhalla/valhalla/pull/4575)
Expand Down
230 changes: 214 additions & 16 deletions locales/bg-BG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,33 @@
"2": "Дръжте <RELATIVE_DIRECTION> по <BEGIN_STREET_NAMES>. Продължете по <STREET_NAMES>.",
"3": "Дръжте <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>.",
"4": "Дръжте <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Дръжте <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Дръжте <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Bear <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Bear <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Bear <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>. Continue on <STREET_NAMES>.",
"9": "Bear <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -82,8 +107,33 @@
"2": "Дръжте <RELATIVE_DIRECTION> към <BEGIN_STREET_NAMES>.",
"3": "Дръжте <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>.",
"4": "Дръжте <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Дръжте <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Дръжте <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Bear <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Bear <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Bear <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"9": "Bear <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -1447,8 +1497,33 @@
"2": "Направете остър завой на <RELATIVE_DIRECTION> по <BEGIN_STREET_NAMES>. Продължете по <STREET_NAMES>.",
"3": "Направете остър завой на <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>.",
"4": "Направете остър завой на <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Направете остър завой на <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Направете остър завой на <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Make a sharp <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Make a sharp <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Make a sharp <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>. Continue on <STREET_NAMES>.",
"9": "Make a sharp <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -1490,8 +1565,33 @@
"2": "Направете остър завой на <RELATIVE_DIRECTION> по <BEGIN_STREET_NAMES>.",
"3": "Направете остър завой на <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>",
"4": "Направете остър завой на <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Направете остър завой на <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Направете остър завой на <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Make a sharp <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Make a sharp <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Make a sharp <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"9": "Make a sharp <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -2018,8 +2118,33 @@
"2": "Завийте на <RELATIVE_DIRECTION> по <BEGIN_STREET_NAMES>. Продължете по <STREET_NAMES>.",
"3": "Завийте на <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>.",
"4": "Завийте на <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Завийте на <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Завийте на <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Turn <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Turn <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Turn <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>. Continue on <STREET_NAMES>.",
"9": "Turn <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -2061,8 +2186,33 @@
"2": "Завийте на <RELATIVE_DIRECTION> по <BEGIN_STREET_NAMES>.",
"3": "Завийте на <RELATIVE_DIRECTION> за да останете на <STREET_NAMES>.",
"4": "Завийте на <RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"5": "Завийте на <RELATIVE_DIRECTION> към <TOWARD_SIGN>."
},
"5": "Завийте на <RELATIVE_DIRECTION> към <TOWARD_SIGN>.",
"6": "Turn <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"7": "Turn <RELATIVE_DIRECTION> onto <STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"8": "Turn <RELATIVE_DIRECTION> onto <BEGIN_STREET_NAMES> at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"9": "Turn <RELATIVE_DIRECTION> at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -2106,8 +2256,32 @@
"4": "Направете обратен завой на <RELATIVE_DIRECTION> на <CROSS_STREET_NAMES> по <STREET_NAMES>.",
"5": "Направете обратен завой на <RELATIVE_DIRECTION> на <CROSS_STREET_NAMES> за да останете на <STREET_NAMES>.",
"6": "Направете обратен завой на<RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"7": "Направете <RELATIVE_DIRECTION> обратен завой към <TOWARD_SIGN>."
},
"7": "Направете <RELATIVE_DIRECTION> обратен завой към <TOWARD_SIGN>.",
"8": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"9": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME> onto <STREET_NAMES>.",
"10": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down Expand Up @@ -2157,8 +2331,32 @@
"4": "Направете обратен завой на <RELATIVE_DIRECTION> на <CROSS_STREET_NAMES> по <STREET_NAMES>.",
"5": "Направете обратен завой на <RELATIVE_DIRECTION> на <CROSS_STREET_NAMES> за да останете на <STREET_NAMES>.",
"6": "Направете обратен завой на<RELATIVE_DIRECTION> на <JUNCTION_NAME>.",
"7": "Направете <RELATIVE_DIRECTION> обратен завой към <TOWARD_SIGN>."
},
"7": "Направете <RELATIVE_DIRECTION> обратен завой към <TOWARD_SIGN>.",
"8": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME>.",
"9": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME> onto <STREET_NAMES>.",
"10": "Make a <RELATIVE_DIRECTION> U-turn at the <LANDMARK_TYPE> <LANDMARK_NAME> to stay on <STREET_NAMES>."
},
"landmark_types": [
"unused",
"gas station",
"post office",
"police station",
"fire station",
"car wash",
"restaurant",
"fast food",
"cafe",
"bank",
"pharmacy",
"kindergarden",
"bar",
"hospital",
"pub",
"clinic",
"theatre",
"cinema",
"casino"
],
"empty_street_name_labels": [
"пешеходата пътека",
"вело алеята",
Expand Down
Loading
Loading