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

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 0ad1be56de43e1cbd3ea617c8bc7f652eb6b1810..c53d5e382a1422b3f3b01b5f5857d7cd8f9dd700 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -16,7 +16,7 @@ $(document).ready(function () {
   let zoom, lat, lon;
 
   if (idData.lat && idData.lon) {
-    ({ zoom, lat, lon } = { zoom: 16, ...idData });
+    ({ zoom, lat, lon } = idData);
   } else if (!mapParams.object) {
     ({ zoom, lat, lon } = mapParams);
   }

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 0ba4200a8462ca86a245b57d26a9a6ecc8ebce56..6b6c69798c4de77e10321a9cd51ffc786a0ee958 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -4,6 +4,7 @@
   <% data = { :configured => Settings.key?(:id_application) }
      data[:lat] = @lat if @lat
      data[:lon] = @lon if @lon
+     data[:zoom] = @zoom if @zoom
      data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
      data[:url] = id_url(:locale => params[:locale]) %>
   <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "w-100 h-100", :allowfullscreen => "", :data => data %>