X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e11d734f9f965464510dd109970501861001ee5c..f9ea6aa718a5babc16bb5195098b504a1bd43e32:/app/assets/javascripts/index/query.js?ds=sidebyside diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index d0e9cc299..a7d228ff9 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,38 +1,36 @@ -//= require jquery.simulate +//= require qs/dist/qs -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', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'], - marker; +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; var featureStyle = { color: "#FF6200", weight: 4, opacity: 1, fillOpacity: 0.5, - clickable: false + interactive: false }; queryButton.on("click", function (e) { e.preventDefault(); e.stopPropagation(); - if (queryButton.hasClass("disabled")) return; - if (queryButton.hasClass("active")) { disableQueryMode(); - } else { + } else if (!queryButton.hasClass("disabled")) { enableQueryMode(); } - }).on("disabled", function (e) { + }).on("disabled", function () { if (queryButton.hasClass("active")) { map.off("click", clickHandler); $(map.getContainer()).removeClass("query-active").addClass("query-disabled"); $(this).tooltip("show"); } - }).on("enabled", function (e) { + }).on("enabled", function () { if (queryButton.hasClass("active")) { map.on("click", clickHandler); $(map.getContainer()).removeClass("query-disabled").addClass("query-active"); @@ -40,34 +38,23 @@ 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 (e) { - 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, origin, radius) { + function interestingFeature(feature) { if (feature.tags) { for (var key in feature.tags) { if (uninterestingTags.indexOf(key) < 0) { @@ -83,25 +70,34 @@ OSM.Query = function(map) { var tags = feature.tags; var prefix = ""; - if (tags.boundary === "administrative") { - prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level) + if (tags.boundary === "administrative" && tags.admin_level) { + prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, { + defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative") + }); } else { var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix"); + var key, value; - for (var key in tags) { - var value = tags[key]; + for (key in tags) { + value = tags[key]; if (prefixes[key]) { if (prefixes[key][value]) { return prefixes[key][value]; - } else { - var first = value.substr(0, 1).toUpperCase(), - rest = value.substr(1).replace(/_/g, " "); - - return first + rest; } } } + + for (key in tags) { + value = tags[key]; + + if (prefixes[key]) { + var first = value.slice(0, 1).toUpperCase(), + rest = value.slice(1).replace(/_/g, " "); + + return first + rest; + } + } } if (!prefix) { @@ -112,12 +108,19 @@ OSM.Query = function(map) { } function featureName(feature) { - var tags = feature.tags; + var tags = feature.tags, + locales = OSM.preferred_languages; + + for (var i = 0; i < locales.length; i++) { + if (tags["name:" + locales[i]]) { + return tags["name:" + locales[i]]; + } + } - if (tags["name"]) { - return tags["name"]; - } else if (tags["ref"]) { - return tags["ref"]; + if (tags.name) { + return tags.name; + } else if (tags.ref) { + return tags.ref; } else if (tags["addr:housename"]) { return tags["addr:housename"]; } else if (tags["addr:housenumber"] && tags["addr:street"]) { @@ -132,7 +135,7 @@ OSM.Query = function(map) { if (feature.type === "node" && feature.lat && feature.lon) { geometry = L.circleMarker([feature.lat, feature.lon], featureStyle); - } else if (feature.type === "way" && feature.geometry) { + } else if (feature.type === "way" && feature.geometry && feature.geometry.length > 0) { geometry = L.polyline(feature.geometry.filter(function (point) { return point !== null; }).map(function (point) { @@ -140,23 +143,19 @@ OSM.Query = function(map) { }), featureStyle); } else if (feature.type === "relation" && feature.members) { geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) { - return geometry !== undefined; + return typeof geometry !== "undefined"; })); } return geometry; } - function runQuery(latlng, radius, query, $section, compare) { + function runQuery(latlng, radius, query, $section, merge, compare) { var $ul = $section.find("ul"); $ul.empty(); $section.show(); - $section.find(".loader").oneTime(1000, "loading", function () { - $(this).show(); - }); - if ($section.data("ajax")) { $section.data("ajax").abort(); } @@ -165,48 +164,74 @@ OSM.Query = function(map) { url: url, method: "POST", data: { - data: "[timeout:5][out:json];" + query, + data: "[timeout:10][out:json];" + query + }, + xhrFields: { + withCredentials: credentials }, - success: function(results) { + success: function (results) { var elements; - $section.find(".loader").stopTime("loading").hide(); - - if (compare) { - elements = results.elements.sort(compare); + $section.find(".loader").hide(); + + if (merge) { + elements = results.elements.reduce(function (hash, element) { + var key = element.type + element.id; + if ("geometry" in element) { + delete element.bounds; + } + hash[key] = $.extend({}, hash[key], element); + return hash; + }, {}); + + elements = Object.keys(elements).map(function (key) { + return elements[key]; + }); } else { elements = results.elements; } + if (compare) { + elements = elements.sort(compare); + } + for (var i = 0; i < elements.length; i++) { var element = elements[i]; - if (interestingFeature(element, latlng, radius)) { + if (interestingFeature(element)) { var $li = $("