X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/712e67ed4a1429309075b484b87a42ca5da6b0a5..33bca7cd655577da0b2b2aac398db221a31700ad:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 514d6dbb2..09e4de31e 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,10 +1,8 @@ -//= require jquery.simulate -//= require querystring +//= require qs/dist/qs OSM.Query = function (map) { - var querystring = require("querystring-component"); - 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; @@ -40,32 +38,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("mousedown", ".query-results li.query-result", function () { - var moved = false; - $(this).one("click", function (e) { - if (!moved) { - var geometry = $(this).data("geometry"); - if (geometry) map.removeLayer(geometry); - - if (!$(e.target).is("a")) { - $(this).find("a").simulate("click", e); - } - } - }).one("mousemove", function () { - moved = true; - }); - }); + .on("mouseover", ".query-results a", showResultGeometry) + .on("mouseout", ".query-results a", hideResultGeometry); function interestingFeature(feature) { if (feature.tags) { @@ -105,8 +92,8 @@ OSM.Query = function (map) { value = tags[key]; if (prefixes[key]) { - var first = value.substr(0, 1).toUpperCase(), - rest = value.substr(1).replace(/_/g, " "); + var first = value.slice(0, 1).toUpperCase(), + rest = value.slice(1).replace(/_/g, " "); return first + rest; } @@ -122,7 +109,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]]) { @@ -169,10 +156,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(); } @@ -183,10 +166,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) { @@ -214,13 +200,14 @@ OSM.Query = function (map) { if (interestingFeature(element)) { var $li = $("