X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9b26dc79c64fd4fde23e03ce15591d22bac3cd98..29925642761b6eb5ab5e19cdabc540dbb2f3cd4a:/app/assets/javascripts/index/query.js?ds=inline diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 180e203d5..12bb49efc 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -4,7 +4,7 @@ OSM.Query = function(map) { 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'], + 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; var featureStyle = { @@ -22,9 +22,7 @@ OSM.Query = function(map) { if (queryButton.hasClass("disabled")) return; if (queryButton.hasClass("active")) { - if ($("#content").hasClass("overlay-sidebar")) { - disableQueryMode(); - } + disableQueryMode(); } else { enableQueryMode(); } @@ -85,7 +83,7 @@ OSM.Query = function(map) { var tags = feature.tags; var prefix = ""; - if (tags.boundary === "administrative") { + if (tags.boundary === "administrative" && tags.admin_level) { prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level) } else { var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix"); @@ -114,7 +112,14 @@ OSM.Query = function(map) { } function featureName(feature) { - var tags = feature.tags; + var tags = feature.tags, + locales = I18n.locales.get(); + + for (var i = 0; i < locales.length; i++) { + if (tags["name:" + locales[i]]) { + return tags["name:" + locales[i]]; + } + } if (tags["name"]) { return tags["name"]; @@ -149,7 +154,7 @@ OSM.Query = function(map) { return geometry; } - function runQuery(latlng, radius, query, $section) { + function runQuery(latlng, radius, query, $section, compare) { var $ul = $section.find("ul"); $ul.empty(); @@ -170,10 +175,18 @@ OSM.Query = function(map) { data: "[timeout:5][out:json];" + query, }, success: function(results) { + var elements; + $section.find(".loader").stopTime("loading").hide(); - for (var i = 0; i < results.elements.length; i++) { - var element = results.elements[i]; + if (compare) { + elements = results.elements.sort(compare); + } else { + elements = results.elements; + } + + for (var i = 0; i < elements.length; i++) { + var element = elements[i]; if (interestingFeature(element, latlng, radius)) { var $li = $("