X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8642e4c1f337c5088c84b2d3a6c0448ef704ed40..f9ea6aa718a5babc16bb5195098b504a1bd43e32:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 2a84207ec..a7d228ff9 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,40 +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'], - 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")) { - if ($("#content").hasClass("overlay-sidebar")) { - disableQueryMode(); - } - } else { + disableQueryMode(); + } 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"); @@ -42,30 +38,24 @@ 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("click", ".query-results li.query-result", function (e) { - if (!$(e.target).is('a')) { - $(this).find("a").simulate("click", e); - } - }); + .on("mouseover", ".query-results a", showResultGeometry) + .on("mouseout", ".query-results a", hideResultGeometry); - function interestingFeature(feature, origin, radius) { + function interestingFeature(feature) { if (feature.tags) { - if (feature.type === "node" && - OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > radius) { - return false; - } - for (var key in feature.tags) { if (uninterestingTags.indexOf(key) < 0) { return true; @@ -80,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) { @@ -109,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"]) { @@ -124,42 +130,32 @@ OSM.Query = function(map) { } } - function featureGeometry(feature, features) { + function featureGeometry(feature) { var geometry; - if (feature.type === "node") { + if (feature.type === "node" && feature.lat && feature.lon) { geometry = L.circleMarker([feature.lat, feature.lon], featureStyle); - } else if (feature.type === "way") { - geometry = L.polyline(feature.nodes.map(function (node) { - return features["node" + node].getLatLng(); + } 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) { + return [point.lat, point.lon]; }), featureStyle); - } else if (feature.type === "relation") { - geometry = L.featureGroup(); - - feature.members.forEach(function (member) { - if (features[member.type + member.ref]) { - geometry.addLayer(features[member.type + member.ref]); - } - }); - } - - if (geometry) { - features[feature.type + feature.id] = geometry; + } else if (feature.type === "relation" && feature.members) { + geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) { + return typeof geometry !== "undefined"; + })); } return geometry; } - function runQuery(latlng, radius, query, $section) { + 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(); } @@ -168,56 +164,97 @@ 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) { - var features = {}; + success: function (results) { + var elements; + + $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; + } - $section.find(".loader").stopTime("loading").hide(); + if (compare) { + elements = elements.sort(compare); + } - for (var i = 0; i < results.elements.length; i++) { - var element = results.elements[i], - geometry = featureGeometry(element, features); + for (var i = 0; i < elements.length; i++) { + var element = elements[i]; - if (interestingFeature(element, latlng, radius)) { + if (interestingFeature(element)) { var $li = $("