Move close button out of left sidebar content

[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 b3d03cdca5ccc97b4a5a9bcfc5119271ad75e91f..e3f6afa46d4a49a4984a94097347878411b854ff 100644 (file)
--- a/app/assets/javascripts/index/directions-endpoint.js
+++ b/app/assets/javascripts/index/directions-endpoint.js
@@ -1,5 +1,5 @@
 OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) {
 OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) {

-  var endpoint = {};
+  const endpoint = {};

 
   endpoint.marker = L.marker([0, 0], {
     icon: L.icon({
 
   endpoint.marker = L.marker([0, 0], {
     icon: L.icon({


@@ -14,27 +14,20 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
     autoPan: true
   });
 
     autoPan: true
   });
 

-  endpoint.enable = function () {
+  endpoint.enableListeners = function () {

     endpoint.marker.on("drag dragend", markerDragListener);
     input.on("keydown", inputKeydownListener);
     input.on("change", inputChangeListener);
   };
 
     endpoint.marker.on("drag dragend", markerDragListener);
     input.on("keydown", inputKeydownListener);
     input.on("change", inputChangeListener);
   };
 

-  endpoint.disable = function () {
+  endpoint.disableListeners = function () {

     endpoint.marker.off("drag dragend", markerDragListener);
     input.off("keydown", inputKeydownListener);
     input.off("change", inputChangeListener);
     endpoint.marker.off("drag dragend", markerDragListener);
     input.off("keydown", inputKeydownListener);
     input.off("change", inputChangeListener);

-
-    if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
-    delete endpoint.geocodeRequest;
-    removeLatLng();
-    delete endpoint.value;
-    input.val("");
-    map.removeLayer(endpoint.marker);

   };
 
   function markerDragListener(e) {
   };
 
   function markerDragListener(e) {

-    var latlng = convertLatLngToZoomPrecision(e.target.getLatLng());
+    const latlng = L.latLng(OSM.cropLocation(e.target.getLatLng(), map.getZoom()));

 
     if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
     delete endpoint.geocodeRequest;
 
     if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
     delete endpoint.geocodeRequest;


@@ -42,6 +35,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
     setLatLng(latlng);
     setInputValueFromLatLng(latlng);
     endpoint.value = input.val();
     setLatLng(latlng);
     setInputValueFromLatLng(latlng);
     endpoint.value = input.val();

+    if (e.type === "dragend") getReverseGeocode();

     dragCallback(e.type === "drag");
   }
 
     dragCallback(e.type === "drag");
   }
 


@@ -51,21 +45,34 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
 
   function inputChangeListener(e) {
     // make text the same in both text boxes
 
   function inputChangeListener(e) {
     // make text the same in both text boxes

-    var value = e.target.value;
+    const value = e.target.value;

     endpoint.setValue(value);
   }
 
   endpoint.setValue = function (value) {
     endpoint.setValue(value);
   }
 
   endpoint.setValue = function (value) {

-    endpoint.value = value;
-    removeLatLng();
-    input.removeClass("is-invalid");
-    input.val(value);
-

     if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
     delete endpoint.geocodeRequest;
     if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
     delete endpoint.geocodeRequest;

+    input.removeClass("is-invalid");
+
+    const coordinatesMatch = value.match(/^\s*([+-]?\d+(?:\.\d*)?)(?:\s+|\s*[/,]\s*)([+-]?\d+(?:\.\d*)?)\s*$/);
+    const latlng = coordinatesMatch && L.latLng(coordinatesMatch[1], coordinatesMatch[2]);
+
+    if (latlng && endpoint.cachedReverseGeocode && endpoint.cachedReverseGeocode.latlng.equals(latlng)) {
+      setLatLng(latlng);
+      if (endpoint.cachedReverseGeocode.notFound) {
+        endpoint.value = value;
+        input.addClass("is-invalid");
+      } else {
+        endpoint.value = endpoint.cachedReverseGeocode.value;
+      }
+      input.val(endpoint.value);
+      changeCallback();
+      return;
+    }

 
 

-    var coordinatesMatch = value.match(/^\s*([+-]?\d+(?:\.\d*)?)(?:\s+|\s*[/,]\s*)([+-]?\d+(?:\.\d*)?)\s*$/);
-    var latlng = coordinatesMatch && L.latLng(coordinatesMatch[1], coordinatesMatch[2]);
+    endpoint.value = value;
+    removeLatLng();
+    input.val(value);

 
     if (latlng) {
       setLatLng(latlng);
 
     if (latlng) {
       setLatLng(latlng);


@@ -77,38 +84,74 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
     }
   };
 
     }
   };
 

+  endpoint.clearValue = function () {
+    if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
+    delete endpoint.geocodeRequest;
+    removeLatLng();
+    delete endpoint.value;
+    input.val("");
+    map.removeLayer(endpoint.marker);
+  };
+
+  endpoint.swapCachedReverseGeocodes = function (otherEndpoint) {
+    const g0 = endpoint.cachedReverseGeocode;
+    const g1 = otherEndpoint.cachedReverseGeocode;
+    delete endpoint.cachedReverseGeocode;
+    delete otherEndpoint.cachedReverseGeocode;
+    if (g0) otherEndpoint.cachedReverseGeocode = g0;
+    if (g1) endpoint.cachedReverseGeocode = g1;
+  };
+

   function getGeocode() {
   function getGeocode() {

-    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;
+    const viewbox = map.getBounds().toBBoxString(), // <sw lon>,<sw lat>,<ne lon>,<ne lat>
+          geocodeUrl = OSM.NOMINATIM_URL + "search?" + new URLSearchParams({ q: endpoint.value, format: "json", viewbox });

 
 

-    endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) {
+    endpoint.geocodeRequest = new AbortController();
+    fetch(geocodeUrl, { signal: endpoint.geocodeRequest.signal })
+      .then(r => r.json())
+      .then(success)
+      .catch(() => {});
+
+    function success(json) {

       delete endpoint.geocodeRequest;
       if (json.length === 0) {
         input.addClass("is-invalid");
       delete endpoint.geocodeRequest;
       if (json.length === 0) {
         input.addClass("is-invalid");

+        // eslint-disable-next-line no-alert

         alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
         return;
       }
 
       setLatLng(L.latLng(json[0]));
 
         alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
         return;
       }
 
       setLatLng(L.latLng(json[0]));
 

+      endpoint.value = json[0].display_name;

       input.val(json[0].display_name);
 
       changeCallback();
       input.val(json[0].display_name);
 
       changeCallback();

-    });
+    }

   }
 
   function getReverseGeocode() {
   }
 
   function getReverseGeocode() {

-    var reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?lat=" + endpoint.latlng.lat + "&lon=" + endpoint.latlng.lng + "&format=json";
+    const latlng = endpoint.latlng.clone(),
+          { lat, lng } = latlng,
+          reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?" + new URLSearchParams({ lat, lon: lng, format: "json" });

 
 

-    endpoint.geocodeRequest = $.getJSON(reverseGeocodeUrl, function (json) {
+    endpoint.geocodeRequest = new AbortController();
+    fetch(reverseGeocodeUrl, { signal: endpoint.geocodeRequest.signal })
+      .then(r => r.json())
+      .then(success)
+      .catch(() => {});
+
+    function success(json) {

       delete endpoint.geocodeRequest;
       if (!json || !json.display_name) {
       delete endpoint.geocodeRequest;
       if (!json || !json.display_name) {

+        endpoint.cachedReverseGeocode = { latlng: latlng, notFound: true };

         return;
       }
 
       endpoint.value = json.display_name;
       input.val(json.display_name);
         return;
       }
 
       endpoint.value = json.display_name;
       input.val(json.display_name);

-    });
+      endpoint.cachedReverseGeocode = { latlng: latlng, value: endpoint.value };
+    }

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


@@ -132,11 +175,5 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
     input.val(latlng.lat + ", " + latlng.lng);
   }
 
     input.val(latlng.lat + ", " + latlng.lng);
   }
 

-  function convertLatLngToZoomPrecision(latlng) {
-    var precision = OSM.zoomPrecision(map.getZoom());
-
-    return L.latLng(latlng.lat.toFixed(precision), latlng.lng.toFixed(precision));
-  }
-

   return endpoint;
 };
   return endpoint;
 };