Merge remote-tracking branch 'upstream/pull/2797'

[rails.git] / app / assets / javascripts / edit / id.js.erb

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 6b902587ec58bfb619b59ec9eb4613b109955f2e..8ab9425e23c051c340957ff5b66f3d814591a8fe 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -1,10 +1,12 @@
+//= require qs/dist/qs
+
 $(document).ready(function () {
   var id = $("#id-embed");
 
   if (id.data("key")) {
-    var hashParams = OSM.params(location.hash.substring(1)),
-        mapParams = OSM.mapParams(),
-        params = {};
+    var hashParams = OSM.params(location.hash.substring(1));
+    var mapParams = OSM.mapParams();
+    var params = {};
 
     if (mapParams.object) {
       params.id = mapParams.object.type[0] + mapParams.object.id;
@@ -20,7 +22,14 @@ $(document).ready(function () {
 
     if (hashParams.background) params.background = hashParams.background;
     if (hashParams.comment) params.comment = hashParams.comment;
+    if (hashParams.disable_features) params.disable_features = hashParams.disable_features;
+    if (hashParams.hashtags) params.hashtags = hashParams.hashtags;
+    if (hashParams.locale) params.locale = hashParams.locale;
+    if (hashParams.maprules) params.maprules = hashParams.maprules;
     if (hashParams.offset) params.offset = hashParams.offset;
+    if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay;
+    if (hashParams.presets) params.presets = hashParams.presets;
+    if (hashParams.source) params.source = hashParams.source;
     if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
 
     if (id.data("gpx")) {
@@ -29,7 +38,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"));
   }