X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/479b22ca772c4a128ab7d4ff33cf6a7aba320be2..e7ef10d4289501a04045e01ecf7fe9202c09eb4f:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 80df594c8..0edc265dc 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,38 +1,71 @@ +//= 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'], - searchRadius = 10, marker; + var featureStyle = { + color: "#FF6200", + weight: 4, + opacity: 1, + fillOpacity: 0.5, + clickable: false + }; + queryButton.on("click", function (e) { e.preventDefault(); e.stopPropagation(); - if (queryButton.hasClass("active")) { - disableQueryMode(); + if (queryButton.hasClass("disabled")) return; - OSM.router.route("/"); + if (queryButton.hasClass("active")) { + if ($("#content").hasClass("overlay-sidebar")) { + disableQueryMode(); + } } else { enableQueryMode(); } + }).on("disabled", function (e) { + if (queryButton.hasClass("active")) { + map.off("click", clickHandler); + $(map.getContainer()).removeClass("query-active").addClass("query-disabled"); + $(this).tooltip("show"); + } + }).on("enabled", function (e) { + if (queryButton.hasClass("active")) { + map.on("click", clickHandler); + $(map.getContainer()).removeClass("query-disabled").addClass("query-active"); + $(this).tooltip("hide"); + } }); $("#sidebar_content") - .on("mouseover", ".query-results li", function () { + .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", function () { + .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) { + var geometry = $(this).data("geometry") + if (geometry) map.removeLayer(geometry); + + if (!$(e.target).is('a')) { + $(this).find("a").simulate("click", e); + } }); - function interestingFeature(feature, origin) { + function interestingFeature(feature, origin, radius) { if (feature.tags) { if (feature.type === "node" && - OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > searchRadius) { + OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > radius) { return false; } @@ -85,6 +118,8 @@ OSM.Query = function(map) { 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"]) { return tags["addr:housenumber"] + " " + tags["addr:street"]; } else { @@ -92,39 +127,33 @@ 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]); + 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; } - function runQuery(latlng, query, $section) { + function runQuery(latlng, radius, query, $section) { var $ul = $section.find("ul"); $ul.empty(); @@ -134,74 +163,109 @@ 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)) { + if (interestingFeature(element, latlng, radius)) { var $li = $("