X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a47c0a4411825f48e447641094678b15df3b2f74..aa78da82fe9a30dfa77e2d503701787aafc6cf55:/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 cb76a3446..d1668f247 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,7 +1,9 @@
-//= require jquery.simulate
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs
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;
@@ -102,8 +104,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;
}
@@ -180,6 +182,9 @@ OSM.Query = function (map) {
data: {
data: "[timeout:10][out:json];" + query
},
+ xhrFields: {
+ withCredentials: credentials
+ },
success: function (results) {
var elements;
@@ -211,28 +216,28 @@ 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);
}
@@ -241,6 +246,7 @@ OSM.Query = function (map) {
$section.find(".loader").stopTime("loading").hide();
$("")
+ .addClass("query-result list-group-item")
.text(I18n.t("javascripts.query." + status, { server: url, error: error }))
.appendTo($ul);
}
@@ -281,7 +287,11 @@ 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(),
+ 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 + ")",
@@ -342,7 +352,7 @@ OSM.Query = function (map) {
};
page.load = function (path, noCentre) {
- var params = qs.parse(path.substring(path.indexOf("?") + 1)),
+ 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)) {