X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daf91662980dfeb6549c2f44c88c428cdcb001a7..1f0f7ba621cadc01c802863135583b1d0feb1bf4:/app/views/site/_id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 8cb7bc853..d93ee091e 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,23 +1,46 @@
 <% if defined? ID_KEY %>
-  <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+  <div id="map">
+    <iframe frameBorder="0" id="id-embed" class="id-embed" allowfullscreen></iframe>
+  </div>
   <script>
-    var coord = {};
-    <% if @lat && @lon && @zoom -%>
-    coord.lat = <%= @lat %>;
-    coord.lon = <%= @lon %>;
-    coord.zoom = <%= @zoom %>;
-    <% else -%>
-    coord = OSM.mapParams();
-    <% end -%>
+    var params = {};
 
-    var hash;
-    if (coord.object && coord.object.type !== 'relation') {
-      hash = '#id=' + coord.object.type[0] + coord.object.id;
+    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.lat + '/' + mapParams.center.lng;
+      }
     } else {
-      hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat
+<% if @lat && @lon -%>
+      params.map = '16/<%= @lat %>/<%= @lon %>';
+<% else -%>
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
+<% end -%>
     }
 
-    $('#id-embed').attr('src', 'id_iframe' + hash);
+    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>