From c12ed852334cdaa1fa583f84641c967bf1d68429 Mon Sep 17 00:00:00 2001 From: Jamie Guthrie Date: Mon, 12 Feb 2018 07:29:31 +0000 Subject: [PATCH] Use both name and ref when naming roads in directions Closes #1741 --- app/assets/javascripts/index/directions/osrm.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index e7c91e9dc..3d32f07e3 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -95,7 +95,18 @@ function OSRMEngine() { Array.prototype.push.apply(line, step_geometry); var instText = "" + (idx + 1) + ". "; - var name = step.name ? "" + step.name + "" : I18n.t('javascripts.directions.instructions.unnamed'); + + var name; + if (step.name && step.ref) { + name = "" + step.name + " (" + step.ref + ")"; + } else if (step.name) { + name = "" + step.name + ""; + } else if (step.ref) { + name = "" + step.ref + ""; + } else { + name = I18n.t('javascripts.directions.instructions.unnamed'); + } + if (step.maneuver.type.match(/rotary|roundabout/)) { instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name } ); } else { -- 2.43.2