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

diff --cc app/assets/javascripts/edit/id.js.erb
index 2c0a022e4e3bb178b0a79ff725f556914ccf9a64,cb4ff18651331ecadf8cf799165e43a2b9cacfe6..7c907ed3a3496d2419179de705791c5f2182f740
--- 1/app/assets/javascripts/edit/id.js.erb
--- 2/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@@ -31,7 -30,7 +30,7 @@@ $(document).ready(function () 
  
    if (mapParams.layers.includes("N")) params.set("notes", "true");
  
-   if (id.data("gpx")) params.set("gpx", id.data("gpx"));
+   if (idData.gpx) params.set("gpx", idData.gpx);
  
-   id.attr("src", id.data("url") + "#" + params.toString().replace(/\+/g, "%20"));
 -  id.attr("src", idData.url + "#" + params);
++  id.attr("src", idData.url + "#" + params.toString().replace(/\+/g, "%20"));
  });