X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f383dcbd7a52b9a1b5ec120750a85bb65ffcfb8..d5a765588f5818bf46575392fa7ccbd4af0de574:/app/views/site/_potlatch.html.erb

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index da348d417..32dc99e8e 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,5 +1,5 @@
 <div id="map">
-  <div id="potlatch"><%= t 'site.edit.flash_player_required' %></div>
+  <div id="potlatch"><%= raw t 'site.edit.flash_player_required' %></div>
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
@@ -7,7 +7,6 @@
 <% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
 
 <script type="text/javascript" defer="defer">
-  var brokenContentSize = $("content").offsetWidth == 0;
   var changesaved=true;
   var winie=false; if (document.all && window.print) { winie=true; }
   
@@ -19,6 +18,15 @@
 
   function markChanged(a) { changesaved=a; }
 
+  function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {
+    updateLinks({ lon: lon, lat: lat }, zoom);
+
+    var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom });
+    if (hash !== location.hash) {
+      location.replace(hash);
+    }
+  }
+
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
 
@@ -43,9 +51,18 @@
     // 700,600 for fixed size, 100%,100% for resizable
   }
 
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);
+  <% else -%>
+  var params = OSM.mapParams();
+  doSWF(params.lat, params.lon, params.zoom || 17);
+  <% end -%>
 
-  function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom || 15);
-  }
+  $(document).ready(function () {
+    $("body").on("click", "a.set_position", function () {
+      var data = $(this).data();
+
+      doSWF(data.lat, data.lon, data.zoom || 15);
+    });
+  });
 </script>