X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1596713871672cc319b0d68b51a3698cc6bf0972..a7092491b069de43bb8d8c30d3526e7095c5cc98:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 117d12df3..49d162b1f 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,18 +1,20 @@ //= require jquery.simulate +//= require querystring -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 querystring = require("querystring-component"); + + var url = 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 = { color: "#FF6200", weight: 4, opacity: 1, fillOpacity: 0.5, - clickable: false + interactive: false }; queryButton.on("click", function (e) { @@ -56,7 +58,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); } } @@ -87,9 +89,10 @@ OSM.Query = function(map) { }); } else { var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix"); + var key, value; - for (var key in tags) { - var value = tags[key]; + for (key in tags) { + value = tags[key]; if (prefixes[key]) { if (prefixes[key][value]) { @@ -98,12 +101,12 @@ OSM.Query = function(map) { } } - for (var key in tags) { - var value = tags[key]; + for (key in tags) { + value = tags[key]; if (prefixes[key]) { var first = value.substr(0, 1).toUpperCase(), - rest = value.substr(1).replace(/_/g, " "); + rest = value.substr(1).replace(/_/g, " "); return first + rest; } @@ -119,7 +122,7 @@ OSM.Query = function(map) { function featureName(feature) { var tags = feature.tags, - locales = I18n.locales.get(); + locales = I18n.locales.get(); for (var i = 0; i < locales.length; i++) { if (tags["name:" + locales[i]]) { @@ -145,7 +148,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) { @@ -153,14 +156,14 @@ 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(); @@ -178,19 +181,34 @@ OSM.Query = function(map) { url: url, method: "POST", data: { - data: "[timeout:5][out:json];" + query, + data: "[timeout:10][out:json];" + query }, - success: function(results) { + success: function (results) { var elements; $section.find(".loader").stopTime("loading").hide(); - if (compare) { - elements = results.elements.sort(compare); + 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]; @@ -210,13 +228,19 @@ OSM.Query = function(map) { } } + if (results.remark) { + $("
  • ") + .text(I18n.t("javascripts.query.error", { server: url, error: results.remark })) + .appendTo($ul); + } + if ($ul.find("li").length === 0) { $("
  • ") .text(I18n.t("javascripts.query.nothing_found")) .appendTo($ul); } }, - error: function(xhr, status, error) { + error: function (xhr, status, error) { $section.find(".loader").stopTime("loading").hide(); $("
  • ") @@ -228,11 +252,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; } @@ -258,16 +282,16 @@ OSM.Query = function(map) { * 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, - 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;"; + 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;"; $("#sidebar_content .query-intro") .hide(); @@ -280,20 +304,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()), - lat = e.latlng.lat.toFixed(precision), - lng = e.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); } @@ -313,15 +338,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 = querystring.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 () { @@ -332,7 +357,7 @@ OSM.Query = function(map) { queryOverpass(params.lat, params.lon); }; - page.unload = function(sameController) { + page.unload = function (sameController) { if (!sameController) { disableQueryMode(); }