Merge remote-tracking branch 'upstream/pull/4897'

diff --combined app/assets/javascripts/index/directions.js
index f07aa7f072fdb9e0b2f03bf17f6feba763884000,efb667420894ddbd810f082c96f9726dfa3869dc..9c5ff2a8d2af724697f2b166e3de7be1b139c352
--- 1/app/assets/javascripts/index/directions.js
--- 2/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@@ -3,6 -3,7 +3,6 @@@
  //= require qs/dist/qs
  
  OSM.Directions = function (map) {
 -  var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
    var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
    var chosenEngine;
  
@@@ -69,10 -70,12 +69,10 @@@
      });
  
      input.on("keydown", function () {
-       input.removeClass("error");
+       input.removeClass("is-invalid");
      });
  
      input.on("change", function (e) {
 -      awaitingGeocode = true;
 -
        // make text the same in both text boxes
        var value = e.target.value;
        endpoint.setValue(value);
@@@ -81,7 -84,7 +81,7 @@@
      endpoint.setValue = function (value, latlng) {
        endpoint.value = value;
        delete endpoint.latlng;
-       input.removeClass("error");
+       input.removeClass("is-invalid");
        input.val(value);
  
        if (latlng) {
@@@ -106,7 -109,7 +106,7 @@@
          endpoint.awaitingGeocode = false;
          endpoint.hasGeocode = true;
          if (json.length === 0) {
-           input.addClass("error");
+           input.addClass("is-invalid");
            alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
            return;
          }
@@@ -115,7 -118,10 +115,7 @@@
  
          input.val(json[0].display_name);
  
 -        if (awaitingGeocode) {
 -          awaitingGeocode = false;
 -          getRoute(true, true);
 -        }
 +        getRoute(true, true);
        });
      };
  
@@@ -203,9 -209,11 +203,9 @@@
        var endpoint = endpoints[ep_i];
        if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
          endpoint.getGeocode();
 -        awaitingGeocode = true;
        }
      }
      if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
 -      awaitingGeocode = true;
        return;
      }