cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separated ordinal roundabout exit text from normal exit text

Browse source
This commit is contained in:
J Guthrie 2018-04-29 21:59:54 +01:00
parent e0b175d3bd
commit e833ef6315
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/index/directions/osrm.js
View file

@ -117,10 +117,14 @@ function OSRMEngine() {
} }
if (step.maneuver.type.match(/rotary|roundabout/)) { if (step.maneuver.type.match(/rotary|roundabout/)) {
if (step.maneuver.exit && step.maneuver.exit <= 10) { if (step.maneuver.exit) {
instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } ); if (step.maneuver.exit <= 10) {
instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name });
} else { } else {
instText += I18n.t(template + '_without_exit', { name: name } ); instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name });
}
} else {
instText += I18n.t(template + '_without_exit', { name: name });
} }
} else if (step.maneuver.type.match(/on ramp|off ramp/)) { } else if (step.maneuver.type.match(/on ramp|off ramp/)) {
var params = {}; var params = {};

1
config/locales/en.yml
View file

@ -2377,6 +2377,7 @@ en:
against_oneway_without_exit: Go against one-way on %{name} against_oneway_without_exit: Go against one-way on %{name}
end_oneway_without_exit: End of one-way on %{name} end_oneway_without_exit: End of one-way on %{name}
roundabout_with_exit: At roundabout take exit %{exit} onto %{name} roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name}
turn_left_with_exit: Exit onto %{name} turn_left_with_exit: Exit onto %{name}
slight_left_with_exit: Exit onto %{name} slight_left_with_exit: Exit onto %{name}
turn_right_with_exit: Exit onto %{name} turn_right_with_exit: Exit onto %{name}