X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be878df0978d5b51f7fbb72fca16f74c5708c818..9649b192c03f7a333f3a02697a64910cd6669dab:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 4b58e6f93..313bd1cc0 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -3,6 +3,7 @@ OSM.Query = function (map) { var url = OSM.OVERPASS_URL, + credentials = OSM.OVERPASS_CREDENTIALS, queryButton = $(".control-query .control-button"), uninterestingTags = ["source", "source_ref", "source:ref", "history", "attribution", "created_by", "tiger:county", "tiger:tlid", "tiger:upload_uuid", "KSJ2:curve_id", "KSJ2:lat", "KSJ2:lon", "KSJ2:coordinate", "KSJ2:filename", "note:ja"], marker; @@ -38,17 +39,21 @@ OSM.Query = function (map) { } }); + function showResultGeometry() { + var geometry = $(this).data("geometry"); + if (geometry) map.addLayer(geometry); + $(this).addClass("selected"); + } + + function hideResultGeometry() { + var geometry = $(this).data("geometry"); + if (geometry) map.removeLayer(geometry); + $(this).removeClass("selected"); + } + $("#sidebar_content") - .on("mouseover", ".query-results li.query-result", function () { - var geometry = $(this).data("geometry"); - if (geometry) map.addLayer(geometry); - $(this).addClass("selected"); - }) - .on("mouseout", ".query-results li.query-result", function () { - var geometry = $(this).data("geometry"); - if (geometry) map.removeLayer(geometry); - $(this).removeClass("selected"); - }) + .on("mouseover", ".query-results li.query-result", showResultGeometry) + .on("mouseout", ".query-results li.query-result", hideResultGeometry) .on("mousedown", ".query-results li.query-result", function () { var moved = false; $(this).one("click", function (e) { @@ -120,7 +125,7 @@ OSM.Query = function (map) { function featureName(feature) { var tags = feature.tags, - locales = I18n.locales.get(); + locales = OSM.preferred_languages; for (var i = 0; i < locales.length; i++) { if (tags["name:" + locales[i]]) { @@ -167,10 +172,6 @@ OSM.Query = function (map) { $ul.empty(); $section.show(); - $section.find(".loader").oneTime(1000, "loading", function () { - $(this).show(); - }); - if ($section.data("ajax")) { $section.data("ajax").abort(); } @@ -181,10 +182,13 @@ OSM.Query = function (map) { data: { data: "[timeout:10][out:json];" + query }, + xhrFields: { + withCredentials: credentials + }, success: function (results) { var elements; - $section.find(".loader").stopTime("loading").hide(); + $section.find(".loader").hide(); if (merge) { elements = results.elements.reduce(function (hash, element) { @@ -212,7 +216,7 @@ OSM.Query = function (map) { if (interestingFeature(element)) { var $li = $("
  • ") - .addClass("query-result list-group-item") + .addClass("query-result list-group-item list-group-item-action") .data("geometry", featureGeometry(element)) .text(featurePrefix(element) + " ") .appendTo($ul); @@ -226,23 +230,23 @@ OSM.Query = function (map) { if (results.remark) { $("
  • ") - .addClass("query-result list-group-item") + .addClass("query-result list-group-item list-group-item-action") .text(I18n.t("javascripts.query.error", { server: url, error: results.remark })) .appendTo($ul); } if ($ul.find("li").length === 0) { $("
  • ") - .addClass("query-result list-group-item") + .addClass("query-result list-group-item list-group-item-action") .text(I18n.t("javascripts.query.nothing_found")) .appendTo($ul); } }, error: function (xhr, status, error) { - $section.find(".loader").stopTime("loading").hide(); + $section.find(".loader").hide(); $("
  • ") - .addClass("query-result list-group-item") + .addClass("query-result list-group-item list-group-item-action") .text(I18n.t("javascripts.query." + status, { server: url, error: error })) .appendTo($ul); } @@ -363,6 +367,7 @@ OSM.Query = function (map) { page.unload = function (sameController) { if (!sameController) { disableQueryMode(); + $("#sidebar_content .query-results li.query-result.selected").each(hideResultGeometry); } };