X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6e154d48c0e77ea110fc93772c6a2be113a90bb1..c12f8959dd2059b4ea9d45caf716923d7589cbb0:/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 86f24e046..59c3a8b49 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,18 +1,19 @@ -//= require jquery.simulate +//= require jquery-simulate/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,17 +39,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("mouseover", ".query-results li.query-result", showResultGeometry) + .on("mouseout", ".query-results li.query-result", hideResultGeometry) .on("mousedown", ".query-results li.query-result", function () { var moved = false; $(this).one("click", function (e) { @@ -56,7 +61,7 @@ OSM.Query = function(map) { var geometry = $(this).data("geometry"); if (geometry) map.removeLayer(geometry); - if (!$(e.target).is('a')) { + if (!$(e.target).is("a")) { $(this).find("a").simulate("click", e); } } @@ -103,8 +108,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 +125,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 +151,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,7 +159,7 @@ 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"; })); } @@ -167,10 +172,6 @@ OSM.Query = function(map) { $ul.empty(); $section.show(); - $section.find(".loader").oneTime(1000, "loading", function () { - $(this).show(); - }); - if ($section.data("ajax")) { $section.data("ajax").abort(); } @@ -179,12 +180,15 @@ 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(); + $section.find(".loader").hide(); if (merge) { elements = results.elements.reduce(function (hash, element) { @@ -212,30 +216,37 @@ OSM.Query = function(map) { if (interestingFeature(element)) { var $li = $("
  • ") - .addClass("query-result") + .addClass("query-result list-group-item") .data("geometry", featureGeometry(element)) - .appendTo($ul); - var $p = $("

    ") .text(featurePrefix(element) + " ") - .appendTo($li); + .appendTo($ul); $("") .attr("href", "/" + element.type + "/" + element.id) .text(featureName(element)) - .appendTo($p); + .appendTo($li); } } + if (results.remark) { + $("

  • ") + .addClass("query-result list-group-item") + .text(I18n.t("javascripts.query.error", { server: url, error: results.remark })) + .appendTo($ul); + } + if ($ul.find("li").length === 0) { $("
  • ") + .addClass("query-result 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("query-result list-group-item") .text(I18n.t("javascripts.query." + status, { server: url, error: error })) .appendTo($ul); } @@ -244,11 +255,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; } @@ -275,15 +286,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 bb;out ids 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(); @@ -296,8 +311,8 @@ 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); @@ -308,9 +323,9 @@ OSM.Query = function(map) { 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); } @@ -330,15 +345,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 () { @@ -349,9 +364,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 li.query-result.selected").each(hideResultGeometry); } };