Update querystring references

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 7755195d46de3a33d5cb79115deb81d1e555963b..933031d8c5d3c4d253e1cfc3e86f383af96ff9c1 100644 (file)
--- 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;
     }
 
       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"));
   }
   } else {
     alert(I18n.t("site.edit.id_not_configured"));
   }

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 935889acee7fc3629290c2eacfdbc61f43abf90d..d15ee58599e21538ecee03967a446260e65b425d 100644 (file)
--- 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")
     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;
       .on("load", function () {
         $(this).remove();
         loaded = true;


@@ -309,7 +309,7 @@ $(document).ready(function () {
     };
 
     page.load = 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);
       }
       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 e3e30ce6bbe859a643f2064bfea6c90c5b4a461a..1adfa2c2492f22f939e7ed6706db44d004da529d 100644 (file)
--- 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);
 
           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()
       }));
         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);
 
           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
       }));
         from: $("#route_from").val(),
         to: lat + "," + lng
       }));

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 4f65acdea96afcf420ca57eb6eb49d2275df4f08..71eedaa83e6532daa51013f396c3370af19c7c8c 100644 (file)
--- 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;
 
     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
       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());
 
 
     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)
       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);
     });
 
       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(","));
         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 fbb6a25c4a0200739b4ed7e6c0a918a4dd01accb..9bcaf25057fbd63037241f4ee2051a3b3599218e 100644 (file)
--- 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);
 
 
     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) {
     var markerLatlng;
 
     if (params.lat && params.lon) {

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 8a190a90ab3f7c1356d3c5c3c642fae0f3086fc9..cb76a3446c1475cac35a637bf3aa98c156c4771c 100644 (file)
--- 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) {
   };
 
   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)) {
         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 a3e53382a0704d497332a5a132500c23db4fc1e3..cfdcdf64f833fd80a0a6c72c1977a831b90ef641 100644 (file)
--- 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 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);
     $(".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 4d9fbac8e35167e951f96f8cfd26bc15225cb9b9..5bd53e8f34a7afb63d084c2ee4425ffbe4e91874 100644 (file)
--- 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 + "/",
     }
 
     var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",

-        query = querystring.stringify(params),
+        query = qs.stringify(params),

         hash = OSM.formatHash(this);
 
     if (query) url += "?" + query;
         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;
     }
 
       params[this._object.type] = this._object.id;
     }
 

-    var query = querystring.stringify(params);
+    var query = qs.stringify(params);

     if (query) {
       str += "?" + query;
     }
     if (query) {
       str += "?" + query;
     }

diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index 853db34a978b22e2ce368d5c0990250c29d7ae13..c997e538bf575fa9e8a27da6bd52a93f4b857de0 100644 (file)
--- 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 () {
 
   // 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();
     params.referer = $("#referer").val();

-    this.search = querystring.stringify(params);
+    this.search = qs.stringify(params);

   });
 
   // Add click handler to show OpenID field
   });
 
   // Add click handler to show OpenID field


@@ -33,7 +33,7 @@ $(document).ready(function () {
     if (referer) {
       args.referer = referer;
     }
     if (referer) {
       args.referer = referer;
     }

-    window.location = action + "?" + querystring.stringify(args);
+    window.location = action + "?" + qs.stringify(args);

     return false;
   });
 });
     return false;
   });
 });

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 205dae0d145358f4f621f8cd9881bb4a76370ab4..09b3ebd75e845e6c4efe96145366adb6266d1484 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -145,7 +145,7 @@ OSM = {
       return args;
     }
 
       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),
 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),