X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/078059b76b8304368fd7ddac2dd563470e83472e..996d5413d85e4d38d33ac3827a1fc853ba9d0149:/app/assets/javascripts/index/query.js diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 8d04efd5f..333fce549 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,31 +1,68 @@ +//= 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 = { + 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(); - - OSM.router.route("/"); - } else { + } else if (!queryButton.hasClass("disabled")) { enableQueryMode(); } + }).on("disabled", function () { + if (queryButton.hasClass("active")) { + map.off("click", clickHandler); + $(map.getContainer()).removeClass("query-active").addClass("query-disabled"); + $(this).tooltip("show"); + } + }).on("enabled", function () { + 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 () { - var geometry = $(this).data("geometry") + .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 () { - var geometry = $(this).data("geometry") + .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; + }); }); function interestingFeature(feature) { @@ -44,25 +81,34 @@ OSM.Query = function(map) { var tags = feature.tags; var prefix = ""; - if (tags.boundary === "administrative") { - prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level) + if (tags.boundary === "administrative" && tags.admin_level) { + prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, { + defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative") + }); } 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]) { return prefixes[key][value]; - } else { - var first = value.substr(0, 1).toUpperCase(), - rest = value.substr(1).replace(/_/g, " "); - - return first + rest; } } } + + for (key in tags) { + value = tags[key]; + + if (prefixes[key]) { + var first = value.substr(0, 1).toUpperCase(), + rest = value.substr(1).replace(/_/g, " "); + + return first + rest; + } + } } if (!prefix) { @@ -73,12 +119,21 @@ OSM.Query = function(map) { } function featureName(feature) { - var tags = feature.tags; + var tags = feature.tags, + locales = I18n.locales.get(); - if (tags["name"]) { - return tags["name"]; - } else if (tags["ref"]) { - return tags["ref"]; + for (var i = 0; i < locales.length; i++) { + if (tags["name:" + locales[i]]) { + return tags["name:" + locales[i]]; + } + } + + if (tags.name) { + 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 { @@ -86,39 +141,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, nodes) { + function featureGeometry(feature) { var geometry; - if (feature.type === "node") { - geometry = L.circleMarker([feature.lat, feature.lon]); - } else if (feature.type === "way") { - geometry = L.polyline(feature.nodes.map(function (node) { - return nodes[node]; + if (feature.type === "node" && feature.lat && feature.lon) { + geometry = L.circleMarker([feature.lat, feature.lon], featureStyle); + } 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" && feature.members) { + geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) { + return geometry !== undefined; })); } return geometry; } - function runQuery(query, $section) { + function runQuery(latlng, radius, query, $section, compare) { var $ul = $section.find("ul"); $ul.empty(); @@ -128,80 +171,131 @@ 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 elements; $section.find(".loader").stopTime("loading").hide(); - results.elements.forEach(function (element) { - if (element.type === "node") { - nodes[element.id] = [element.lat, element.lon]; - } - }); + if (compare) { + elements = results.elements.sort(compare); + } else { + elements = results.elements; + } - for (var i = 0; i < results.elements.length; i++) { - var element = results.elements[i]; + for (var i = 0; i < elements.length; i++) { + var element = elements[i]; if (interestingFeature(element)) { var $li = $("