X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ca35ac16e7aeb877d19cdea245e342337107b6ec..ca07fe853cd743f6d17ebcd02b6e8794e548e2a4:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index b9aa4f4d0..0edc265dc 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,7 +1,9 @@ //= require jquery.simulate OSM.Query = function(map) { - var queryButton = $(".control-query .control-button"), + 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; @@ -20,9 +22,9 @@ OSM.Query = function(map) { if (queryButton.hasClass("disabled")) return; if (queryButton.hasClass("active")) { - disableQueryMode(); - - OSM.router.route("/"); + if ($("#content").hasClass("overlay-sidebar")) { + disableQueryMode(); + } } else { enableQueryMode(); } @@ -52,6 +54,9 @@ OSM.Query = function(map) { $(this).removeClass("selected"); }) .on("click", ".query-results li.query-result", function (e) { + var geometry = $(this).data("geometry") + if (geometry) map.removeLayer(geometry); + if (!$(e.target).is('a')) { $(this).find("a").simulate("click", e); } @@ -122,33 +127,27 @@ OSM.Query = function(map) { } } - function featureLink(feature) { - if (feature.type === "area") { - if (feature.id >= 3600000000) { - var id = feature.id - 3600000000; - - return "/browse/relation/" + id; - } else if (feature.id >= 2400000000) { - var id = feature.id - 2400000000; - - return "/browse/way/" + id; - } else { - return "/browse/node/" + feature.id; - } - } else { - return "/browse/" + feature.type + "/" + feature.id; - } - } - - function featureGeometry(feature, nodes) { + function featureGeometry(feature, features) { var geometry; if (feature.type === "node") { geometry = L.circleMarker([feature.lat, feature.lon], featureStyle); } else if (feature.type === "way") { geometry = L.polyline(feature.nodes.map(function (node) { - return nodes[node]; + return features["node" + node].getLatLng(); }), 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; } return geometry; @@ -164,37 +163,36 @@ OSM.Query = function(map) { $(this).show(); }); - $.ajax({ - url: "http://overpass-api.de/api/interpreter", - method: "GET", + if ($section.data("ajax")) { + $section.data("ajax").abort(); + } + + $section.data("ajax", $.ajax({ + url: url, + method: "POST", data: { data: "[timeout:5][out:json];" + query, }, success: function(results) { - var nodes = {}; + var features = {}; $section.find(".loader").stopTime("loading").hide(); - results.elements.forEach(function (element) { - if (element.type === "node") { - nodes[element.id] = [element.lat, element.lon]; - } - }); - for (var i = 0; i < results.elements.length; i++) { - var element = results.elements[i]; + var element = results.elements[i], + geometry = featureGeometry(element, features); if (interestingFeature(element, latlng, radius)) { var $li = $("