X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d1bebd08035434880a5edb92fdae8c9b24d825f9..899891fe8a16934ab98b16456ea95d9f9c81587d:/app/assets/javascripts/index/search.js?ds=sidebyside diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index e9f06ddf0..485920c8e 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,14 +1,43 @@ //= require jquery.simulate 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 input[name=query]").on("input", function(e) { + if ($(e.target).val() === "") { + $(".describe_location").fadeIn(100); + } else { + $(".describe_location").fadeOut(100); + } + }); + + $(".search_form a.button.switch_link").on("click", function(e) { + e.preventDefault(); + var query = $(e.target).parent().parent().find("input[name=query]").val(); + if (query) { + OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map)); + } else { + OSM.router.route("/directions" + OSM.formatHash(map)); + } + }); + + $(".search_form").on("submit", function(e) { + e.preventDefault(); + $("header").addClass("closed"); + var query = $(this).find("input[name=query]").val(); + if (query) { + OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); + } else { + OSM.router.route("/" + OSM.formatHash(map)); + } + }); + + $(".describe_location").on("click", function(e) { + e.preventDefault(); + var center = map.getCenter().wrap(), + precision = OSM.zoomPrecision(map.getZoom()); + OSM.router.route("/search?query=" + encodeURIComponent( + center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) + )); + }); $("#sidebar_content") .on("click", ".search_more a", clickSearchMore) @@ -40,13 +69,13 @@ OSM.Search = function(map) { }); } - function showSearchResult(e) { + 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: getUserIcon()}); + marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()}); $(this).data("marker", marker); } @@ -56,7 +85,7 @@ OSM.Search = function(map) { $(this).closest("li").addClass("selected"); } - function hideSearchResult(e) { + function hideSearchResult() { var marker = $(this).data("marker"); if (marker) {