Stop the map overlapping the top bar

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 31e15f09df707d0501c9c15769d82171d8296033..1d45d622356f7399a043d0110a87a561d06df77c 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -63,15 +63,8 @@
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
     // 700,600 for fixed size, 100%,100% for resizable
   }
 

-  <% if params[:node] -%>
-  <% bbox = Node.find(params[:node]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% elsif params[:way] -%>
-  <% bbox = Way.find(params[:way]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% elsif params[:gpx] -%>
-  <% trace = Trace.find(params[:gpx]) -%>
-  doSWF(<%= trace.latitude %>,<%= trace.longitude %>,16);
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);

   <% else -%>
   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);
   <% else -%>
   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);


@@ -79,12 +72,10 @@
 
   $(document).ready(function () {
     $("body").on("click", "a.set_position", function () {
 
   $(document).ready(function () {
     $("body").on("click", "a.set_position", function () {

-      var lat = parseFloat($(this).attr("data-lat"));
-      var lon = parseFloat($(this).attr("data-lon"));
-      var zoom = parseInt($(this).attr("data-zoom"));
+      var data = $(this).data();

 
       $("#potlatch").each(function () {
 
       $("#potlatch").each(function () {

-        this.setPosition(lat, lon, Math.max(zoom || 15, 13));
+        this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));

       });
     });
   });
       });
     });
   });