Update bundle

[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 5a0a7a4324374e0953a0fc6981eacd7e7d188cff..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">
 <% 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 = {};
   </div>
   <script>
     var params = {};


@@ -8,14 +8,37 @@
     var mapParams = OSM.mapParams();
     if (mapParams.object) {
       params.id = mapParams.object.type[0] + mapParams.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 {
     } else {

-      params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
+<% if @lat && @lon -%>
+      params.map = '16/<%= @lat %>/<%= @lon %>';
+<% else -%>
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
+<% end -%>

     }
 
     var hashParams = OSM.params(location.hash.substring(1));
     }
 
     var hashParams = OSM.params(location.hash.substring(1));

+

     if (hashParams.background) {
       params.background = hashParams.background;
     }
     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>
 
     $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>