From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Jul 2019 09:03:09 +0000 (+0100)
Subject: Update querystring references
X-Git-Tag: live~3856
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a47c0a4411825f48e447641094678b15df3b2f74?ds=inline
Update querystring references
---
diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 7755195d4..933031d8c 100644
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -36,7 +36,7 @@ $(document).ready(function () {
params.gpx = hashParams.gpx;
}
- id.attr("src", id.data("url") + "#" + querystring.stringify(params));
+ id.attr("src", id.data("url") + "#" + qs.stringify(params));
} else {
alert(I18n.t("site.edit.id_not_configured"));
}
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 935889ace..d15ee5859 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -264,7 +264,7 @@ $(document).ready(function () {
var iframe = $("<iframe>")
.hide()
.appendTo("body")
- .attr("src", url + querystring.stringify(query))
+ .attr("src", url + qs.stringify(query))
.on("load", function () {
$(this).remove();
loaded = true;
@@ -309,7 +309,7 @@ $(document).ready(function () {
};
page.load = function () {
- var params = querystring.parse(location.search.substring(1));
+ var params = qs.parse(location.search.substring(1));
if (params.query) {
$("#sidebar .search_form input[name=query]").value(params.query);
}
diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index e3e30ce6b..1adfa2c24 100644
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -7,7 +7,7 @@ OSM.initializeContextMenu = function (map) {
lat = latlng.lat.toFixed(precision),
lng = latlng.lng.toFixed(precision);
- OSM.router.route("/directions?" + querystring.stringify({
+ OSM.router.route("/directions?" + qs.stringify({
from: lat + "," + lng,
to: $("#route_to").val()
}));
@@ -22,7 +22,7 @@ OSM.initializeContextMenu = function (map) {
lat = latlng.lat.toFixed(precision),
lng = latlng.lng.toFixed(precision);
- OSM.router.route("/directions?" + querystring.stringify({
+ OSM.router.route("/directions?" + qs.stringify({
from: $("#route_from").val(),
to: lat + "," + lng
}));
diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 4f65acdea..71eedaa83 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -139,7 +139,7 @@ OSM.Directions = function (map) {
var from = endpoints[0].latlng,
to = endpoints[1].latlng;
- OSM.router.route("/directions?" + querystring.stringify({
+ OSM.router.route("/directions?" + qs.stringify({
from: $("#route_to").val(),
to: $("#route_from").val(),
route: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng
@@ -210,7 +210,7 @@ OSM.Directions = function (map) {
var precision = OSM.zoomPrecision(map.getZoom());
- OSM.router.replace("/directions?" + querystring.stringify({
+ OSM.router.replace("/directions?" + qs.stringify({
engine: chosenEngine.id,
route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)
@@ -367,7 +367,7 @@ OSM.Directions = function (map) {
getRoute(true, true);
});
- var params = querystring.parse(location.search.substring(1)),
+ var params = qs.parse(location.search.substring(1)),
route = (params.route || "").split(";"),
from = route[0] && L.latLng(route[0].split(",")),
to = route[1] && L.latLng(route[1].split(","));
diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index fbb6a25c4..9bcaf2505 100644
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -107,7 +107,7 @@ OSM.NewNote = function (map) {
map.addLayer(noteLayer);
- var params = querystring.parse(path.substring(path.indexOf("?") + 1));
+ var params = qs.parse(path.substring(path.indexOf("?") + 1));
var markerLatlng;
if (params.lat && params.lon) {
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 8a190a90a..cb76a3446 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -342,7 +342,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)) {
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index a3e53382a..cfdcdf64f 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -120,7 +120,7 @@ OSM.Search = function (map) {
var page = {};
page.pushstate = page.popstate = function (path) {
- var params = querystring.parse(path.substring(path.indexOf("?") + 1));
+ var params = qs.parse(path.substring(path.indexOf("?") + 1));
$(".search_form input[name=query]").val(params.query);
$(".describe_location").hide();
OSM.loadSidebarContent(path, page.load);
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 4d9fbac8e..5bd53e8f3 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -115,7 +115,7 @@ L.OSM.Map = L.Map.extend({
}
var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
- query = querystring.stringify(params),
+ query = qs.stringify(params),
hash = OSM.formatHash(this);
if (query) url += "?" + query;
@@ -180,7 +180,7 @@ L.OSM.Map = L.Map.extend({
params[this._object.type] = this._object.id;
}
- var query = querystring.stringify(params);
+ var query = qs.stringify(params);
if (query) {
str += "?" + query;
}
diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 853db34a9..c997e538b 100644
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -6,9 +6,9 @@ $(document).ready(function () {
// Attach referer to authentication buttons
$(".auth_button").each(function () {
- var params = querystring.parse(this.search.substring(1));
+ var params = qs.parse(this.search.substring(1));
params.referer = $("#referer").val();
- this.search = querystring.stringify(params);
+ this.search = qs.stringify(params);
});
// Add click handler to show OpenID field
@@ -33,7 +33,7 @@ $(document).ready(function () {
if (referer) {
args.referer = referer;
}
- window.location = action + "?" + querystring.stringify(args);
+ window.location = action + "?" + qs.stringify(args);
return false;
});
});
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 205dae0d1..09b3ebd75 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -145,7 +145,7 @@ OSM = {
return args;
}
- hash = querystring.parse(hash.substr(i + 1));
+ hash = qs.parse(hash.substr(i + 1));
var map = (hash.map || '').split('/'),
zoom = parseInt(map[0], 10),