DB changes + Related issues added

[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 6409582cd1133cd43ebfe3e08c38f5a07e462f65..ed36385bd47822b330a8561cfb3250135e99eb99 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,6 +8,10 @@
     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.lng + '/' + mapParams.center.lat;
+      }

     } else {
 <% if @lat && @lon -%>
       params.map = '16/<%= @lon %>/<%= @lat %>';
     } else {
 <% if @lat && @lon -%>
       params.map = '16/<%= @lon %>/<%= @lat %>';


@@ -21,10 +25,20 @@
     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;
     }
     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>