X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a3795cddbb1e4ec7a697a78645d7df880bd690b3..9b9e857b726d4a45af5e1b760ac1639cd31f0280:/app/assets/javascripts/index/search.js?ds=inline diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index 9ed243466..476ad30a1 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,9 +1,6 @@ -//= require jquery.simulate -//= require querystring +//= require qs/dist/qs OSM.Search = function (map) { - var querystring = require("querystring-component"); - $(".search_form input[name=query]").on("input", function (e) { if ($(e.target).val() === "") { $(".describe_location").fadeIn(100); @@ -12,9 +9,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(); - 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 { @@ -36,27 +33,18 @@ OSM.Search = function (map) { $(".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) - )); + precision = OSM.zoomPrecision(map.getZoom()), + lat = center.lat.toFixed(precision), + lng = center.lng.toFixed(precision); + + OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng)); }); $("#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) - .on("mousedown", "li.search_results_entry:has(a.set_position)", function () { - var moved = false; - $(this).one("click", function (e) { - if (!moved && !$(e.target).is("a")) { - $(this).find("a.set_position").simulate("click", e); - } - }).one("mousemove", function () { - moved = true; - }); - }); + .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult); var markers = L.layerGroup().addTo(map); @@ -64,13 +52,23 @@ OSM.Search = function (map) { 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 = {}; $(this).hide(); div.find(".loader").show(); - $.get($(this).attr("href"), function (data) { - div.replaceWith(data); + params[csrf_param] = csrf_token; + + $.ajax({ + url: $(this).attr("href"), + method: "POST", + data: params, + success: function (data) { + div.replaceWith(data); + } }); } @@ -86,8 +84,6 @@ OSM.Search = function (map) { } markers.addLayer(marker); - - $(this).closest("li").addClass("selected"); } function hideSearchResult() { @@ -96,8 +92,6 @@ OSM.Search = function (map) { if (marker) { markers.removeLayer(marker); } - - $(this).closest("li").removeClass("selected"); } function panToSearchResult(data) { @@ -123,25 +117,34 @@ OSM.Search = function (map) { 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); - $(".describe_location").hide(); + var params = Qs.parse(path.substring(path.indexOf("?") + 1)); + if (params.query) { + $(".search_form input[name=query]").val(params.query); + $(".describe_location").hide(); + } else if (params.lat && params.lon) { + $(".search_form input[name=query]").val(params.lat + ", " + params.lon); + $(".describe_location").hide(); + } OSM.loadSidebarContent(path, page.load); }; page.load = function () { $(".search_results_entry").each(function (index) { - var entry = $(this); + var entry = $(this), + csrf_param = $("meta[name=csrf-param]").attr("content"), + csrf_token = $("meta[name=csrf-token]").attr("content"), + params = { + zoom: map.getZoom(), + minlon: map.getBounds().getWest(), + minlat: map.getBounds().getSouth(), + maxlon: map.getBounds().getEast(), + maxlat: map.getBounds().getNorth() + }; + params[csrf_param] = csrf_token; $.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() - }, + method: "POST", + data: params, success: function (html) { entry.html(html); // go to first result of first geocoder