Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...

diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js
index e249ce1f56311c29f3119d5785484bc9adb3090a..38b22043010a9d6b76d1973192cc3e7cf7318416 100644 (file)
--- a/app/assets/javascripts/index/directions/osrm.js
+++ b/app/assets/javascripts/index/directions/osrm.js
@@ -117,7 +117,7 @@ function OSRMEngine() {
         }
 
         if (step.maneuver.type.match(/rotary|roundabout/)) {
-          if (step.maneuver.exit) {
+          if (step.maneuver.exit && step.maneuver.exit <= 10) {
             instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } );
           } else {
             instText += I18n.t(template + '_without_exit', { name: name } );

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2a575492bc5b4939f643622960147f34904e225..3b5e5ffa2b496ae0def2b38dbabc7db76b83d20c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2395,7 +2395,6 @@ en:
           eight: "8th"
           nine: "9th"
           ten: "10th"
-          gt_ten: ""
       time: "Time"
     query:
       node: Node