Merge remote-tracking branch 'upstream/pull/2921' into master

[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 8cb7bc8533dbb213e4fc22d1308d387183fa3fe7..f1f48c1e10687f71f600f9f5235ff9aff8f1332a 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,24 +1,10 @@
-<% if defined? ID_KEY %>
-  <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
-  <script>
-    var coord = {};
-    <% if @lat && @lon && @zoom -%>
-    coord.lat = <%= @lat %>;
-    coord.lon = <%= @lon %>;
-    coord.zoom = <%= @zoom %>;
-    <% else -%>
-    coord = OSM.mapParams();
-    <% end -%>
+<%= javascript_include_tag "edit/id" %>

 
 

-    var hash;
-    if (coord.object && coord.object.type !== 'relation') {
-      hash = '#id=' + coord.object.type[0] + coord.object.id;
-    } else {
-      hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat
-    }
-
-    $('#id-embed').attr('src', 'id_iframe' + hash);
-  </script>
-<% else %>
-  <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
-<% end %>
+<div id="map">
+  <% data = { :key => Settings.id_key } -%>
+  <% 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 => "id-embed", :allowfullscreen => "", :data => data %>
+</div>