X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae00fa84c8f981e909c61ab31b6115bb96e859cc..361dcbb1dfd05c09034ed92da9bbf4305fcb8da9:/app/assets/javascripts/index/search.js diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index 2bfbb2e1c..e54c5132c 100644 --- 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() === "") { @@ -33,12 +31,9 @@ OSM.Search = function (map) { $(".describe_location").on("click", function (e) { e.preventDefault(); $("header").addClass("closed"); - var center = map.getCenter().wrap(), - precision = OSM.zoomPrecision(map.getZoom()), - lat = center.lat.toFixed(precision), - lng = center.lng.toFixed(precision); + const [lat, lon] = OSM.cropLocation(map.getCenter(), map.getZoom()); - OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng)); + OSM.router.route("/search?" + new URLSearchParams({ lat, lon })); }); $("#sidebar_content") @@ -118,12 +113,12 @@ OSM.Search = function (map) { var page = {}; page.pushstate = page.popstate = function (path) { - var params = Qs.parse(path.substring(path.indexOf("?") + 1)); - if (params.query) { - $(".search_form input[name=query]").val(params.query); + 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.lat && params.lon) { - $(".search_form input[name=query]").val(params.lat + ", " + params.lon); + } 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);