X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7b3ba447f8fa06ae4441f9ba2c76085347257ea..621cb8a1effa92f6a9df1c387d035b22e16c7941:/app/views/site/_potlatch2.html.erb diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 95a52368e..65ca9210e 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -42,6 +42,7 @@ flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml"; flashvars.connection = "XML"; flashvars.show_help = "once"; + flashvars.user_check = "warn"; <% if token %> flashvars.oauth_token = "<%= token.token %>"; flashvars.oauth_token_secret = "<%= token.secret %>"; @@ -63,21 +64,22 @@ // 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); + <% if @lat && @lon -%> + doSWF(<%= @lat %>,<%= @lon %>,16); <% else -%> - doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); + var params = OSM.mapParams(); + doSWF(params.lat, params.lon, params.zoom || 17); <% end -%> - function setPosition(lat, lon, zoom) { + $("body").on("click", "a.set_position", function (e) { + e.preventDefault(); + + 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)); }); - } + }); function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) { updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);