X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49..c8671c137ab09e8b93444d8a56d4a72d70014bf9:/app/views/site/_id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 195873c34..d93ee091e 100644
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,27 +1,44 @@
 <% if defined? ID_KEY %>
   <div id="map">
-    <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+    <iframe frameBorder="0" id="id-embed" class="id-embed" allowfullscreen></iframe>
   </div>
   <script>
     var params = {};
 
     var mapParams = OSM.mapParams();
-    if (mapParams.object &&
-        mapParams.object.type !== 'note' &&
-        mapParams.object.type !== 'changeset') {
+    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 {
 <% if @lat && @lon -%>
-      params.map = '16/<%= @lon %>/<%= @lat %>';
+      params.map = '16/<%= @lat %>/<%= @lon %>';
 <% else -%>
-      params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
 <% 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>