X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c162c065c6f6db5dc584599f5639b296b627a165..44199f23e1520623555eac2de6a2e97e3ed0e4ad:/app/assets/javascripts/index/query.js
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 8a190a90a..b64bccd64 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,4 +1,5 @@
-//= require jquery.simulate
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs
OSM.Query = function (map) {
var url = OSM.OVERPASS_URL,
@@ -211,28 +212,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 +242,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 +283,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 +348,7 @@ OSM.Query = function (map) {
};
page.load = function (path, noCentre) {
- var params = querystring.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)) {