X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4d91fe3dd95c1058cb8d24fd4c900223e30b9059..2ddd667910301e73a9961ffd70b72011f1dfb22a:/app/views/site/_potlatch2.html.erb diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 31e15f09d..1d45d6223 100644 --- 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 } - <% 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); @@ -79,12 +72,10 @@ $(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 () { - this.setPosition(lat, lon, Math.max(zoom || 15, 13)); + this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13)); }); }); });