Merge remote-tracking branch 'openstreetmap/pull/1469'

[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 7ddee6218269792a64b18bbc4301ce15945d84e3..d93ee091e91d68e3d478776891b959067e8b8168 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,6 +1,6 @@
 <% 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 = {};
@@ -10,13 +10,13 @@
       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;
+        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 -%>
     }
 
@@ -25,13 +25,15 @@
     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]) %>';
+    params.gpx = '<%= trace_data_url(params[:gpx], :format => :xml) %>';
 <% else -%>
     if (hashParams.gpx) {
       params.gpx = hashParams.gpx;