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

[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 24042081d73eabbb4d84436a71e151e914c3e55f..9ae7ce84fff948bbf4a7303bfc07f794dc617e77 100644 (file)
--- a/app/assets/javascripts/index/directions-endpoint.js
+++ b/app/assets/javascripts/index/directions-endpoint.js
@@ -14,24 +14,40 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
     autoPan: true
   });
 
     autoPan: true
   });
 

-  endpoint.marker.on("drag dragend", function (e) {
+  endpoint.enable = function () {
+    endpoint.marker.on("drag dragend", markerDragListener);
+    input.on("keydown", inputKeydownListener);
+    input.on("change", inputChangeListener);
+  };
+
+  endpoint.disable = function () {
+    endpoint.marker.off("drag dragend", markerDragListener);
+    input.off("keydown", inputKeydownListener);
+    input.off("change", inputChangeListener);
+
+    if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
+    delete endpoint.geocodeRequest;
+    map.removeLayer(endpoint.marker);
+  };
+
+  function markerDragListener(e) {

     var latlng = e.target.getLatLng();
 
     setLatLng(latlng);
     setInputValueFromLatLng(latlng);
     endpoint.value = input.val();
     dragCallback(e.type === "drag");
     var latlng = e.target.getLatLng();
 
     setLatLng(latlng);
     setInputValueFromLatLng(latlng);
     endpoint.value = input.val();
     dragCallback(e.type === "drag");

-  });
+  }

 
 

-  input.on("keydown", function () {
+  function inputKeydownListener() {

     input.removeClass("is-invalid");
     input.removeClass("is-invalid");

-  });
+  }

 
 

-  input.on("change", function (e) {
+  function inputChangeListener(e) {

     // make text the same in both text boxes
     var value = e.target.value;
     endpoint.setValue(value);
     // make text the same in both text boxes
     var value = e.target.value;
     endpoint.setValue(value);

-  });
+  }

 
   endpoint.setValue = function (value, latlng) {
     endpoint.value = value;
 
   endpoint.setValue = function (value, latlng) {
     endpoint.value = value;


@@ -43,25 +59,18 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
       setLatLng(latlng);
       setInputValueFromLatLng(latlng);
       changeCallback();
       setLatLng(latlng);
       setInputValueFromLatLng(latlng);
       changeCallback();

-    } else {
-      endpoint.getGeocode();
+    } 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;
-    }
-
-    endpoint.awaitingGeocode = true;
-
+  function getGeocode() {

     var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>
     var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>

+    var geocodeUrl = OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox;

 
 

-    $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox, function (json) {
-      endpoint.awaitingGeocode = false;
-      endpoint.hasGeocode = true;
+    if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
+    endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) {
+      delete endpoint.geocodeRequest;

       if (json.length === 0) {
         input.addClass("is-invalid");
         alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
       if (json.length === 0) {
         input.addClass("is-invalid");
         alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));


@@ -74,10 +83,9 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
 
       changeCallback();
     });
 
       changeCallback();
     });

-  };
+  }

 
   function setLatLng(ll) {
 
   function setLatLng(ll) {

-    endpoint.hasGeocode = true;

     endpoint.latlng = ll;
     endpoint.marker
       .setLatLng(ll)
     endpoint.latlng = ll;
     endpoint.marker
       .setLatLng(ll)