X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fd7840d5f16f21431fb4f0b1d62387cd045b1da4..6c4b028232f5ad687c0def013b8de6a2b4013b4f:/app/assets/javascripts/index/directions-endpoint.js?ds=sidebyside

diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index/directions-endpoint.js
index 0f53e77d9..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], {
@@ -15,7 +15,11 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge
   });
 
   endpoint.marker.on("drag dragend", function (e) {
-    endpoint.setLatLng(e.target.getLatLng());
+    var latlng = e.target.getLatLng();
+
+    setLatLng(latlng);
+    setInputValueFromLatLng(latlng);
+    endpoint.value = input.val();
     dragCallback(e.type === "drag");
   });
 
@@ -36,49 +40,47 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge
     input.val(value);
 
     if (latlng) {
-      endpoint.setLatLng(latlng);
-    } else {
-      endpoint.getGeocode();
+      setLatLng(latlng);
+      setInputValueFromLatLng(latlng);
+      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(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>
 
     $.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 }));
         return;
       }
 
-      endpoint.setLatLng(L.latLng(json[0]));
+      setLatLng(L.latLng(json[0]));
 
       input.val(json[0].display_name);
 
-      geocodeCallback();
+      changeCallback();
     });
-  };
+  }
 
-  endpoint.setLatLng = function (ll) {
-    var precision = OSM.zoomPrecision(map.getZoom());
-    input.val(ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision));
-    endpoint.hasGeocode = true;
+  function setLatLng(ll) {
     endpoint.latlng = ll;
     endpoint.marker
       .setLatLng(ll)
       .addTo(map);
-  };
+  }
+
+  function setInputValueFromLatLng(latlng) {
+    var precision = OSM.zoomPrecision(map.getZoom());
+
+    input.val(latlng.lat.toFixed(precision) + ", " + latlng.lng.toFixed(precision));
+  }
 
   return endpoint;
 };