X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58e95f7ea46accda6359b187ce5936aad4ac5945..c8e21c409c9bec446f0caa2526d5b07861bb3299:/app/assets/javascripts/index/query.js
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 5c6e58170..b64bccd64 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,9 +1,7 @@
-//= require jquery.simulate
-//= require querystring
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs
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"],
@@ -214,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);
}
@@ -244,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);
}
@@ -349,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)) {