X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/95f1069552e9581152ad1a4ca772d36357e4006c..a3737b74badf62a50bf354025a3079ed20ffa70b:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 6b6f3231f..3c1af5056 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,39 +1,101 @@
-OSM.Search = function(map) {
-  $(".search_form input[name=query]")
-    .on("focus", function() {
-      $(".describe_location").fadeOut(100);
-    })
-    .on("blur", function() {
+OSM.Search = function (map) {
+  $(".search_form input[name=query]").on("input", function (e) {
+    if ($(e.target).val() === "") {
       $(".describe_location").fadeIn(100);
-    });
+    } else {
+      $(".describe_location").fadeOut(100);
+    }
+  });
+
+  $(".search_form a.btn.switch_link").on("click", function (e) {
+    e.preventDefault();
+    var query = $(this).closest("form").find("input[name=query]").val();
+    let search = "";
+    if (query) search = "?" + new URLSearchParams({ from: query });
+    OSM.router.route("/directions" + search + OSM.formatHash(map));
+  });
+
+  $(".search_form").on("submit", function (e) {
+    e.preventDefault();
+    $("header").addClass("closed");
+    var query = $(this).find("input[name=query]").val();
+    let search = "/";
+    if (query) search = "/search?" + new URLSearchParams({ query });
+    OSM.router.route(search + OSM.formatHash(map));
+  });
+
+  $(".describe_location").on("click", function (e) {
+    e.preventDefault();
+    $("header").addClass("closed");
+    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom());
+
+    OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));
+  });
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
-    .on("click", ".search_results_entry a.set_position", clickSearchResult);
+    .on("click", ".search_results_entry a.set_position", clickSearchResult)
+    .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
+    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult);
+
+  var markers = L.layerGroup().addTo(map);
 
   function clickSearchMore(e) {
     e.preventDefault();
     e.stopPropagation();
 
-    var div = $(this).parents(".search_more");
+    var div = $(this).parents(".search_more"),
+        csrf_param = $("meta[name=csrf-param]").attr("content"),
+        csrf_token = $("meta[name=csrf-token]").attr("content"),
+        params = new URLSearchParams();
 
     $(this).hide();
     div.find(".loader").show();
 
-    $.get($(this).attr("href"), function(data) {
-      div.replaceWith(data);
-    });
+    params.set(csrf_param, csrf_token);
+
+    fetch($(this).attr("href"), {
+      method: "POST",
+      body: params
+    })
+      .then(response => response.text())
+      .then(data => div.replaceWith(data));
   }
 
-  function clickSearchResult(e) {
-    var data = $(this).data(),
-      center = L.latLng(data.lat, data.lon);
+  function showSearchResult() {
+    var marker = $(this).data("marker");
 
+    if (!marker) {
+      var data = $(this).find("a.set_position").data();
+
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
+
+      $(this).data("marker", marker);
+    }
+
+    markers.addLayer(marker);
+  }
+
+  function hideSearchResult() {
+    var marker = $(this).data("marker");
+
+    if (marker) {
+      markers.removeLayer(marker);
+    }
+  }
+
+  function panToSearchResult(data) {
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
       map.fitBounds([[data.minLat, data.minLon], [data.maxLat, data.maxLon]]);
     } else {
-      map.setView(center, data.zoom);
+      map.setView([data.lat, data.lon], data.zoom);
     }
+  }
+
+  function clickSearchResult(e) {
+    var data = $(this).data();
+
+    panToSearchResult(data);
 
     // Let clicks to object browser links propagate.
     if (data.type && data.id) return;
@@ -42,42 +104,57 @@ OSM.Search = function(map) {
     e.stopPropagation();
   }
 
-  var marker = L.marker([0, 0], {icon: getUserIcon()});
-
   var page = {};
 
-  page.pushstate = page.popstate = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
-    $(".search_form input[name=query]").val(params.query);
+  page.pushstate = page.popstate = function (path) {
+    const params = new URLSearchParams(path.substring(path.indexOf("?")));
+    if (params.has("query")) {
+      $(".search_form input[name=query]").val(params.get("query"));
+      $(".describe_location").hide();
+    } else if (params.has("lat") && params.has("lon")) {
+      $(".search_form input[name=query]").val(params.get("lat") + ", " + params.get("lon"));
+      $(".describe_location").hide();
+    }
     OSM.loadSidebarContent(path, page.load);
   };
 
-  page.load = function() {
-    $(".search_results_entry").each(function() {
-      var entry = $(this);
-      $.ajax({
-        url: entry.data("href"),
-        method: 'GET',
-        data: {
-          zoom: map.getZoom(),
-          minlon: map.getBounds().getWest(),
-          minlat: map.getBounds().getSouth(),
-          maxlon: map.getBounds().getEast(),
-          maxlat: map.getBounds().getNorth()
-        },
-        success: function(html) {
+  page.load = function () {
+    $(".search_results_entry").each(function (index) {
+      var entry = $(this),
+          csrf_param = $("meta[name=csrf-param]").attr("content"),
+          csrf_token = $("meta[name=csrf-token]").attr("content"),
+          params = new URLSearchParams({
+            zoom: map.getZoom(),
+            minlon: map.getBounds().getWest(),
+            minlat: map.getBounds().getSouth(),
+            maxlon: map.getBounds().getEast(),
+            maxlat: map.getBounds().getNorth()
+          });
+      params.set(csrf_param, csrf_token);
+      fetch(entry.data("href"), {
+        method: "POST",
+        body: params
+      })
+        .then(response => response.text())
+        .then(function (html) {
           entry.html(html);
-        }
-      });
+          // go to first result of first geocoder
+          if (index === 0) {
+            var firstResult = entry.find("*[data-lat][data-lon]:first").first();
+            if (firstResult.length) {
+              panToSearchResult(firstResult.data());
+            }
+          }
+        });
     });
 
     return map.getState();
   };
 
-  page.unload = function() {
-    map.removeLayer(marker);
-    map.removeObject();
+  page.unload = function () {
+    markers.clearLayers();
     $(".search_form input[name=query]").val("");
+    $(".describe_location").fadeIn(100);
   };
 
   return page;