X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/77e39800d5940f8ece90f490aa228290433b56e1..e11d734f9f965464510dd109970501861001ee5c:/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 c0f40d1e1..d0e9cc299 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,8 +1,10 @@ //= require jquery.simulate OSM.Query = function(map) { - var queryButton = $(".control-query .control-button"), - uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'], + 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; var featureStyle = { @@ -21,8 +23,6 @@ OSM.Query = function(map) { if (queryButton.hasClass("active")) { disableQueryMode(); - - OSM.router.route("/"); } else { enableQueryMode(); } @@ -51,19 +51,24 @@ OSM.Query = function(map) { 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("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; + }); }); function interestingFeature(feature, origin, radius) { 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; @@ -122,51 +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, 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) { + 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 geometry !== undefined; + })); } return geometry; } - function runQuery(latlng, radius, query, $section) { + function runQuery(latlng, radius, query, $section, compare) { var $ul = $section.find("ul"); $ul.empty(); @@ -176,32 +157,41 @@ 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 features = {}; + var elements; $section.find(".loader").stopTime("loading").hide(); - for (var i = 0; i < results.elements.length; i++) { - var element = results.elements[i], - geometry = featureGeometry(element, features); + 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 = $("
  • ") .addClass("query-result") - .data("geometry", geometry) + .data("geometry", featureGeometry(element)) .appendTo($ul); var $p = $("

    ") .text(featurePrefix(element) + " ") .appendTo($li); $("") - .attr("href", featureLink(element)) + .attr("href", "/" + element.type + "/" + element.id) .text(featureName(element)) .appendTo($p); } @@ -212,17 +202,59 @@ OSM.Query = function(map) { .text(I18n.t("javascripts.query.nothing_found")) .appendTo($ul); } + }, + error: function(xhr, status, error) { + $section.find(".loader").stopTime("loading").hide(); + + $("

  • ") + .text(I18n.t("javascripts.query." + status, { server: url, error: error })) + .appendTo($ul); } - }); + })); } + function compareSize(feature1, feature2) { + var width1 = feature1.bounds.maxlon - feature1.bounds.minlon, + height1 = feature1.bounds.maxlat - feature1.bounds.minlat, + area1 = width1 * height1, + width2 = feature2.bounds.maxlat - feature2.bounds.minlat, + height2 = feature2.bounds.maxlat - feature2.bounds.minlat, + area2 = width2 * height2; + + return area1 - area2; + } + + /* + * To find nearby objects we ask overpass for the union of the + * following sets: + * + * node(around:,,lng>) + * way(around:,,lng>) + * relation(around:,,lng>) + * + * to find enclosing objects we first find all the enclosing areas: + * + * is_in(,)->.a + * + * and then return the union of the following sets: + * + * relation(pivot.a) + * way(pivot.a) + * + * In both cases we then ask to retrieve tags and the geometry + * for each object. + */ function queryOverpass(lat, lng) { var latlng = L.latLng(lat, lng), + bounds = map.getBounds(), + bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(), radius = 10 * Math.pow(1.5, 19 - map.getZoom()), around = "around:" + radius + "," + lat + "," + lng, - features = "(node(" + around + ");way(" + around + ");relation(" + around + "))", - nearby = "((" + features + ";way(bn));node(w));out;", - isin = "(is_in(" + lat + "," + lng + ");>);out;"; + nodes = "node(" + around + ")", + ways = "way(" + around + ")", + relations = "relation(" + around + ")", + nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");", + isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags geom(" + bbox + ");relation(pivot.a);out tags bb;"; $("#sidebar_content .query-intro") .hide(); @@ -242,7 +274,7 @@ OSM.Query = function(map) { }, 10); runQuery(latlng, radius, nearby, $("#query-nearby")); - runQuery(latlng, radius, isin, $("#query-isin")); + runQuery(latlng, radius, isin, $("#query-isin"), compareSize); } function clickHandler(e) { @@ -270,21 +302,27 @@ OSM.Query = function(map) { page.pushstate = page.popstate = function(path) { OSM.loadSidebarContent(path, function () { - page.load(path); + page.load(path, true); }); }; - page.load = function(path) { - var params = querystring.parse(path.substring(path.indexOf('?') + 1)); + page.load = function(path, noCentre) { + var params = querystring.parse(path.substring(path.indexOf('?') + 1)), + latlng = L.latLng(params.lat, params.lon); - queryOverpass(params.lat, params.lon); - enableQueryMode(); + if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) { + OSM.router.withoutMoveListener(function () { + map.setView(latlng, 15); + }); + } - return map.getState(); + queryOverpass(params.lat, params.lon); }; - page.unload = function() { - disableQueryMode(); + page.unload = function(sameController) { + if (!sameController) { + disableQueryMode(); + } }; return page;