X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..2d7e0a397a1b2dbed74f40439c1305b1b48a063e:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 333fce549..7d63280ee 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,18 +1,18 @@ -//= 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) { @@ -38,32 +38,21 @@ 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 () { - 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) { if (feature.tags) { @@ -103,8 +92,8 @@ OSM.Query = function(map) { value = tags[key]; if (prefixes[key]) { - var first = value.substr(0, 1).toUpperCase(), - rest = value.substr(1).replace(/_/g, " "); + var first = value.slice(0, 1).toUpperCase(), + rest = value.slice(1).replace(/_/g, " "); return first + rest; } @@ -120,7 +109,7 @@ OSM.Query = function(map) { function featureName(feature) { var tags = feature.tags, - locales = I18n.locales.get(); + locales = OSM.preferred_languages; for (var i = 0; i < locales.length; i++) { if (tags["name:" + locales[i]]) { @@ -146,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) { @@ -154,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(); } @@ -179,48 +164,74 @@ OSM.Query = function(map) { url: url, method: "POST", data: { - data: "[timeout:5][out:json];" + query, + data: "[timeout:10][out:json];" + query }, - success: function(results) { + xhrFields: { + withCredentials: credentials + }, + 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)) { var $li = $("
  • ") - .addClass("query-result") - .data("geometry", featureGeometry(element)) - .appendTo($ul); - var $p = $("

    ") + .addClass("list-group-item list-group-item-action") .text(featurePrefix(element) + " ") - .appendTo($li); + .appendTo($ul); $("") + .addClass("stretched-link") .attr("href", "/" + element.type + "/" + element.id) + .data("geometry", featureGeometry(element)) .text(featureName(element)) - .appendTo($p); + .appendTo($li); } } + if (results.remark) { + $("

  • ") + .addClass("list-group-item") + .text(I18n.t("javascripts.query.error", { server: url, error: results.remark })) + .appendTo($ul); + } + if ($ul.find("li").length === 0) { $("
  • ") + .addClass("list-group-item") .text(I18n.t("javascripts.query.nothing_found")) .appendTo($ul); } }, - error: function(xhr, status, error) { - $section.find(".loader").stopTime("loading").hide(); + error: function (xhr, status, error) { + $section.find(".loader").hide(); $("
  • ") + .addClass("list-group-item") .text(I18n.t("javascripts.query." + status, { server: url, error: error })) .appendTo($ul); } @@ -229,11 +240,11 @@ OSM.Query = function(map) { 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; + 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; } @@ -242,9 +253,9 @@ OSM.Query = function(map) { * To find nearby objects we ask overpass for the union of the * following sets: * - * node(around:,,lng>) - * way(around:,,lng>) - * relation(around:,,lng>) + * node(around:,,) + * way(around:,,) + * relation(around:,,) * * to find enclosing objects we first find all the enclosing areas: * @@ -260,15 +271,19 @@ OSM.Query = function(map) { */ function queryOverpass(lat, lng) { var latlng = L.latLng(lat, lng).wrap(), - bounds = map.getBounds().wrap(), - bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(), - radius = 10 * Math.pow(1.5, 19 - map.getZoom()), - around = "around:" + radius + "," + lat + "," + lng, - 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;"; + bounds = map.getBounds().wrap(), + precision = OSM.zoomPrecision(map.getZoom()), + bbox = bounds.getSouth().toFixed(precision) + "," + + bounds.getWest().toFixed(precision) + "," + + bounds.getNorth().toFixed(precision) + "," + + bounds.getEast().toFixed(precision), + radius = 10 * Math.pow(1.5, 19 - map.getZoom()), + around = "around:" + radius + "," + lat + "," + lng, + 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 bb;out ids geom(" + bbox + ");relation(pivot.a);out tags bb;"; $("#sidebar_content .query-intro") .hide(); @@ -281,21 +296,21 @@ OSM.Query = function(map) { map.removeLayer(marker); } else { marker.setStyle({ - opacity: 1 - i * 0.1, - fillOpacity: 0.5 - i * 0.05 + opacity: 1 - (i * 0.1), + fillOpacity: 0.5 - (i * 0.05) }); } }, 10); - runQuery(latlng, radius, nearby, $("#query-nearby")); - runQuery(latlng, radius, isin, $("#query-isin"), compareSize); + runQuery(latlng, radius, nearby, $("#query-nearby"), false); + runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize); } function clickHandler(e) { var precision = OSM.zoomPrecision(map.getZoom()), - latlng = e.latlng.wrap(), - lat = latlng.lat.toFixed(precision), - lng = latlng.lng.toFixed(precision); + latlng = e.latlng.wrap(), + lat = latlng.lat.toFixed(precision), + lng = latlng.lng.toFixed(precision); OSM.router.route("/query?lat=" + lat + "&lon=" + lng); } @@ -315,15 +330,15 @@ OSM.Query = function(map) { var page = {}; - page.pushstate = page.popstate = function(path) { + page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path, function () { page.load(path, true); }); }; - page.load = function(path, noCentre) { - var params = querystring.parse(path.substring(path.indexOf('?') + 1)), - latlng = L.latLng(params.lat, params.lon); + page.load = function (path, noCentre) { + var params = Qs.parse(path.substring(path.indexOf("?") + 1)), + latlng = L.latLng(params.lat, params.lon); if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) { OSM.router.withoutMoveListener(function () { @@ -334,9 +349,10 @@ OSM.Query = function(map) { queryOverpass(params.lat, params.lon); }; - page.unload = function(sameController) { + page.unload = function (sameController) { if (!sameController) { disableQueryMode(); + $("#sidebar_content .query-results a.selected").each(hideResultGeometry); } };