X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6dd451c7ee48663d6b0753bfe8b4da2060c4cf60..1ba5b7fef0e468296f8d772aa4de02b681bdbf53:/app/assets/javascripts/edit/id.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb index 23726519e..90318788c 100644 --- a/app/assets/javascripts/edit/id.js.erb +++ b/app/assets/javascripts/edit/id.js.erb @@ -1,16 +1,16 @@ -//= require querystring +//= require qs/dist/qs $(document).ready(function () { - var querystring = require("querystring-component"); var id = $("#id-embed"); - if (id.data("key")) { - var hashParams = OSM.params(location.hash.substring(1)); + if (id.data("configured") === true) { + var hash = location.hash.substring(1); + var hashParams = hash ? OSM.params(hash) : {}; var mapParams = OSM.mapParams(); var params = {}; if (mapParams.object) { - params.id = mapParams.object.type[0] + mapParams.object.id; + params.id = mapParams.object.type + '/' + mapParams.object.id; mapParams = OSM.parseHash(location.hash); if (mapParams.center) { params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng; @@ -28,9 +28,15 @@ $(document).ready(function () { if (hashParams.locale) params.locale = hashParams.locale; if (hashParams.maprules) params.maprules = hashParams.maprules; if (hashParams.offset) params.offset = hashParams.offset; + if (hashParams.photo) params.photo = hashParams.photo; + if (hashParams.photo_dates) params.photo_dates = hashParams.photo_dates; if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay; + if (hashParams.photo_username) params.photo_username = hashParams.photo_username; if (hashParams.presets) params.presets = hashParams.presets; if (hashParams.source) params.source = hashParams.source; + if (hashParams.validationDisable) params.validationDisable = hashParams.validationDisable; + if (hashParams.validationWarning) params.validationWarning = hashParams.validationWarning; + if (hashParams.validationError) params.validationError = hashParams.validationError; if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough; if (id.data("gpx")) { @@ -39,7 +45,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")); }