X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1f250c45bda8a499d47b9d5fcc3cba0eb969507a..e7ef10d4289501a04045e01ecf7fe9202c09eb4f:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index d9906407d..0edc265dc 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,7 +1,9 @@ //= require jquery.simulate OSM.Query = function(map) { - var queryButton = $(".control-query .control-button"), + var protocol = document.location.protocol === "https:" ? "https:" : "http:", + url = protocol + OSM.OVERPASS_URL, + queryButton = $(".control-query .control-button"), uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'], marker; @@ -20,9 +22,9 @@ OSM.Query = function(map) { if (queryButton.hasClass("disabled")) return; if (queryButton.hasClass("active")) { - disableQueryMode(); - - OSM.router.route("/"); + if ($("#content").hasClass("overlay-sidebar")) { + disableQueryMode(); + } } else { enableQueryMode(); } @@ -52,6 +54,9 @@ OSM.Query = function(map) { $(this).removeClass("selected"); }) .on("click", ".query-results li.query-result", function (e) { + var geometry = $(this).data("geometry") + if (geometry) map.removeLayer(geometry); + if (!$(e.target).is('a')) { $(this).find("a").simulate("click", e); } @@ -163,7 +168,7 @@ OSM.Query = function(map) { } $section.data("ajax", $.ajax({ - url: OSM.OVERPASS_URL, + url: url, method: "POST", data: { data: "[timeout:5][out:json];" + query, @@ -198,16 +203,48 @@ OSM.Query = function(map) { .text(I18n.t("javascripts.query.nothing_found")) .appendTo($ul); } + }, + error: function(xhr, status, error) { + $section.find(".loader").stopTime("loading").hide(); + + $("