Use both name and ref when naming roads in directions
authorJamie Guthrie <jamie.guthrie@gmail.com>
Mon, 12 Feb 2018 07:29:31 +0000 (07:29 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 12 Feb 2018 20:12:57 +0000 (20:12 +0000)
Closes #1741

app/assets/javascripts/index/directions/osrm.js

index e7c91e9..3d32f07 100644 (file)
@@ -95,7 +95,18 @@ function OSRMEngine() {
         Array.prototype.push.apply(line, step_geometry);
 
         var instText = "<b>" + (idx + 1) + ".</b> ";
-        var name = step.name ? "<b>" + step.name + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
+        
+        var name;
+        if (step.name && step.ref) {
+          name = "<b>" + step.name + " (" + step.ref + ")</b>";
+        } else if (step.name) {
+          name = "<b>" + step.name + "</b>";
+        } else if (step.ref) {
+          name = "<b>" + step.ref + "</b>";
+        } 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 {