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

[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 ed36385bd47822b330a8561cfb3250135e99eb99..867b148fd4aeba0ea4b1ba5a47945d33a0e6a238 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,47 +1,10 @@
-<% if defined? ID_KEY %>
-  <div id="map">
-    <iframe frameBorder="0" id="id-embed" class="id-embed" allowfullscreen></iframe>
-  </div>
-  <script>
-    var params = {};
-
-    var mapParams = OSM.mapParams();
-    if (mapParams.object) {
-      params.id = mapParams.object.type[0] + mapParams.object.id;
-      mapParams = OSM.parseHash(location.hash);
-      if (mapParams.center) {
-        params.map = mapParams.zoom + '/' + mapParams.center.lng + '/' + mapParams.center.lat;
-      }
-    } else {
-<% if @lat && @lon -%>
-      params.map = '16/<%= @lon %>/<%= @lat %>';
-<% else -%>
-      params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
-<% end -%>
-    }
-
-    var hashParams = OSM.params(location.hash.substring(1));
-
-    if (hashParams.background) {
-      params.background = hashParams.background;
-    }
-    if (hashParams.comment) {
-      params.comment = hashParams.comment;
-    }
-    if (hashParams.offset) {
-      params.offset = hashParams.offset;
-    }
-
-<% if params[:gpx] -%>
-    params.gpx = '<%= trace_data_url(params[:gpx], :format => :xml) %>';
-<% else -%>
-    if (hashParams.gpx) {
-      params.gpx = hashParams.gpx;
-    }
-<% end -%>
-
-    $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
-  </script>
-<% else %>
-  <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
-<% end %>
+<%= javascript_include_tag "edit/id" %>
+
+<div id="map">
+  <% data = { :key => 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]) -%>
+  <%= content_tag :iframe, "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
+</div>