Show/hide "Where is this?" when setting search value from directions

[rails.git] / 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 b9a4ff9a2b39b235d4af188e856d287377aefa21..d111eca35f2682729053f9b1862cb0404aaa5e02 100644 (file)
--- 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], {
@@ -17,7 +17,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge
   endpoint.marker.on("drag dragend", function (e) {
     var latlng = e.target.getLatLng();
 
-    endpoint.setLatLng(latlng);
+    setLatLng(latlng);
     setInputValueFromLatLng(latlng);
     endpoint.value = input.val();
     dragCallback(e.type === "drag");
@@ -40,48 +40,41 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge
     input.val(value);
 
     if (latlng) {
-      endpoint.setLatLng(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(); // <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) {
-    endpoint.hasGeocode = true;
+  function setLatLng(ll) {
     endpoint.latlng = ll;
     endpoint.marker
       .setLatLng(ll)
       .addTo(map);
-  };
+  }
 
   function setInputValueFromLatLng(latlng) {
     var precision = OSM.zoomPrecision(map.getZoom());