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

[rails.git] / app / views / site / _id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 680c45cdebd1f2707662eb714ae7ad70caaa1474..0ba4200a8462ca86a245b57d26a9a6ecc8ebce56 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,34 +1,10 @@
-<% if defined? ID_KEY %>
-<iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
-<% token = @user.access_token(ID_KEY) %>
-<script>
-var keys = {
-    '<%= request.protocol + request.host_with_port %>': {
-        oauth_consumer_key: "<%= token.client_application.key %>",
-        oauth_secret: "<%= token.client_application.secret %>",
-        oauth_token: "<%= token.token %>",
-        oauth_token_secret: "<%= token.secret %>"
-    }
-};
+<%= javascript_include_tag "edit/id" %>
 
-var coord = {};
-<% if @lat && @lon && @zoom -%>
-coord.lat = <%= @lat %>;
-coord.lon = <%= @lon %>;
-coord.zoom = <%= @zoom %>;
-<% else -%>
-var params = OSM.mapParams();
-coord.lat = params.lat;
-coord.lon = params.lon;
-coord.zoom = params.zoom;
-<% end -%>
-var url = 'id_iframe#map=' + coord.zoom + '/' + coord.lon + '/' + coord.lat +
-    '&preauth=' + JSON.stringify(keys);
-$('#id-embed').attr('src', url);
-</script>
-<% else%>
-<script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
-<% end %>
-
-<script type="text/javascript">
-</script>
+<div id="map" class="h-100 overflow-hidden">
+  <% data = { :configured => Settings.key?(:id_application) }
+     data[:lat] = @lat if @lat
+     data[:lon] = @lon if @lon
+     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 %>
+</div>