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

[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 6590e83b4c4b00cc251db3b485e7fa2c3d44ce1f..e54c5132c65ab4dca495aa72bfc9ed380718df7b 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,5 +1,3 @@
-//= require qs/dist/qs
-

 OSM.Search = function (map) {
   $(".search_form input[name=query]").on("input", function (e) {
     if ($(e.target).val() === "") {
 OSM.Search = function (map) {
   $(".search_form input[name=query]").on("input", function (e) {
     if ($(e.target).val() === "") {


@@ -9,9 +7,9 @@ OSM.Search = function (map) {
     }
   });
 
     }
   });
 

-  $(".search_form a.button.switch_link").on("click", function (e) {
+  $(".search_form a.btn.switch_link").on("click", function (e) {

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

-    var query = $(e.target).parent().parent().find("input[name=query]").val();
+    var query = $(this).closest("form").find("input[name=query]").val();

     if (query) {
       OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {
     if (query) {
       OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {


@@ -32,11 +30,10 @@ OSM.Search = function (map) {
 
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
 
   $(".describe_location").on("click", function (e) {
     e.preventDefault();

-    var center = map.getCenter().wrap(),
-        precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
-      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
-    ));
+    $("header").addClass("closed");
+    const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom());
+
+    OSM.router.route("/search?" + new URLSearchParams({ lat, lon }));

   });
 
   $("#sidebar_content")
   });
 
   $("#sidebar_content")


@@ -83,8 +80,6 @@ OSM.Search = function (map) {
     }
 
     markers.addLayer(marker);
     }
 
     markers.addLayer(marker);

-
-    $(this).closest("li").addClass("selected");

   }
 
   function hideSearchResult() {
   }
 
   function hideSearchResult() {


@@ -93,8 +88,6 @@ OSM.Search = function (map) {
     if (marker) {
       markers.removeLayer(marker);
     }
     if (marker) {
       markers.removeLayer(marker);
     }

-
-    $(this).closest("li").removeClass("selected");

   }
 
   function panToSearchResult(data) {
   }
 
   function panToSearchResult(data) {


@@ -120,9 +113,14 @@ OSM.Search = function (map) {
   var page = {};
 
   page.pushstate = page.popstate = function (path) {
   var page = {};
 
   page.pushstate = page.popstate = function (path) {

-    var params = Qs.parse(path.substring(path.indexOf("?") + 1));
-    $(".search_form input[name=query]").val(params.query);
-    $(".describe_location").hide();
+    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);
   };
 
     OSM.loadSidebarContent(path, page.load);
   };