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

[rails.git] / app / assets / javascripts / index / search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 132447ec5b3e81bfa386355bb5b7f2c2f24aefd7..b33d904a97613ca3c5369bfa453a9b3b3de9eb44 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,72 +1,160 @@
-OSM.Search = function(map) {
-  $("#query")
-    .on("focus", function() {
-      $("#describe_location").fadeOut(100);
-    })
-    .on("blur", function() {
-      $("#describe_location").fadeIn(100);
-    });
+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();
+    const query = $(this).closest("form").find("input[name=query]").val();
+    let search = "";
+    if (query) search = "?" + new URLSearchParams({ to: query });
+    OSM.router.route("/directions" + search + OSM.formatHash(map));
+  });

 
 

-  $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult);
+  $(".search_form").on("submit", function (e) {
+    e.preventDefault();
+    $("header").addClass("closed");
+    const query = $(this).find("input[name=query]").val();
+    let search = "/";
+    if (query) search = "/search?" + new URLSearchParams({ query });
+    OSM.router.route(search + OSM.formatHash(map));
+  });

 
 

-  function clickSearchResult(e) {
+  $(".describe_location").on("click", function (e) {

     e.preventDefault();
     e.preventDefault();

+    $("header").addClass("closed");
+    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom());

 
 

-    var data = $(this).data(),
-      center = L.latLng(data.lat, data.lon);
+    OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));
+  });

 
 

-    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);
+  $("#sidebar_content")
+    .on("click", ".search_more a", clickSearchMore)
+    .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);
+
+  const markers = L.layerGroup().addTo(map);
+
+  function clickSearchMore(e) {
+    e.preventDefault();
+    e.stopPropagation();
+
+    const 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();
+
+    params.set(csrf_param, csrf_token);
+
+    fetch($(this).attr("href"), {
+      method: "POST",
+      body: params
+    })
+      .then(response => response.text())
+      .then(data => div.replaceWith(data));
+  }
+
+  function showSearchResult() {
+    let marker = $(this).data("marker");
+
+    if (!marker) {
+      const data = $(this).find("a.set_position").data();
+
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
+
+      $(this).data("marker", marker);

     }
 
     }
 

-    marker
-      .setLatLng(center)
-      .addTo(map);
+    markers.addLayer(marker);
+  }
+
+  function hideSearchResult() {
+    const marker = $(this).data("marker");

 
 

-    if (data.type && data.id) {
-      map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
+    if (marker) {
+      markers.removeLayer(marker);

     }
   }
 
     }
   }
 

-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+  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([data.lat, data.lon], data.zoom);
+    }
+  }

 
 

-  var page = {};
+  function clickSearchResult(e) {
+    const data = $(this).data();
+
+    panToSearchResult(data);
+
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) return;

 
 

-  page.pushstate = page.popstate = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
-    $("#query").val(params.query);
-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $("#sidebar_content").load(path, page.load);
+    e.preventDefault();
+    e.stopPropagation();
+  }
+
+  const page = {};
+
+  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) {
+      const 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);
           entry.html(html);

-        }
-      });
+          // go to first result of first geocoder
+          if (index === 0) {
+            const 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();
-    $("#query").val("");
+  page.unload = function () {
+    markers.clearLayers();
+    $(".search_form input[name=query]").val("");
+    $(".describe_location").fadeIn(100);

   };
 
   return page;
   };
 
   return page;