X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/953d8b4b59e8b194bf83b094ecfd9f5e368a04b8..6c4b028232f5ad687c0def013b8de6a2b4013b4f:/app/assets/javascripts/index/directions-endpoint.js diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index/directions-endpoint.js index 14c91a4fb..d111eca35 100644 --- a/app/assets/javascripts/index/directions-endpoint.js +++ b/app/assets/javascripts/index/directions-endpoint.js @@ -1,4 +1,4 @@ -OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, geocodeCallback) { +OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) { var endpoint = {}; endpoint.marker = L.marker([0, 0], { @@ -42,25 +42,19 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge if (latlng) { setLatLng(latlng); setInputValueFromLatLng(latlng); - } else { - endpoint.getGeocode(); + changeCallback(); + } else if (endpoint.value) { + getGeocode(); } }; - endpoint.getGeocode = function () { - // if no one has entered a value yet, then we can't geocode, so don't - // even try. - if (!endpoint.value) { - return; - } - + function getGeocode() { endpoint.awaitingGeocode = true; var viewbox = map.getBounds().toBBoxString(); // ,,, $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox, function (json) { endpoint.awaitingGeocode = false; - endpoint.hasGeocode = true; if (json.length === 0) { input.addClass("is-invalid"); alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); @@ -71,12 +65,11 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge input.val(json[0].display_name); - geocodeCallback(); + changeCallback(); }); - }; + } function setLatLng(ll) { - endpoint.hasGeocode = true; endpoint.latlng = ll; endpoint.marker .setLatLng(ll)