api06: s/delete_with_relations_and_history/delete_with_history/g

[rails.git] / app / views / site / edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index ab6d70575bef726d52974de248e737edb7072a6e..ac54cb5e5f74c101f962b92fdb3c32657e479bd6 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -24,27 +24,29 @@
 <% session[:token] = @user.tokens.create.token unless session[:token] %>
 
 <% if params['mlon'] and params['mlat'] %>
-<% lon =  h(params['mlon']) %>
-<% lat =  h(params['mlat'])  %>
-<% zoom =  h(params['zoom'] || '12') %>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
-<% lon =  @user.home_lon %>
-<% lat =  @user.home_lat %>
-<% zoom = '12' %>
-<%else%>
-<% lon =  h(params['lon'] || '-0.1') %>
-<% lat =  h(params['lat'] || '51.5') %>
-<% zoom =  h(params['zoom'] || '12') %>
+       <% lon =  h(params['mlon']) %>
+       <% lat =  h(params['mlat'])  %>
+       <% zoom =  h(params['zoom'] || '14') %>
+<% elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil? %> 
+       <% lon =  @user.home_lon %>
+       <% lat =  @user.home_lat %>
+       <% zoom = '14' %>
+<% else %>
+       <% lon =  h(params['lon'] || 'null') %>
+       <% lat =  h(params['lat'] || 'null') %>
+       <% zoom =  h(params['zoom'] || '14') %>
 <% end %>
 
-<div id="map">You need a Flash player to use Potlatch, the
+<div id="map">
+       You need a Flash player to use Potlatch, the
     OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
 
     <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.
 </div>
+
 <%= javascript_include_tag 'swfobject.js' %>
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
   // 700,600 for fixed size, 100%,100% for resizable
@@ -59,17 +61,17 @@
 
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
-    fo.addVariable('lat',lat);
-    fo.addVariable('long',lon);
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
+    if (lat) { fo.addVariable('lat',lat); }
+    if (lon) { fo.addVariable('long',lon); }
     <% if params['gpx'] %>
-    fo.addVariable('gpx','<%= h(params['gpx']) + "/data.xml" %>');
+               fo.addVariable('gpx','<%= h(params['gpx']) %>');
     <% end %>
     fo.write("map");
   }
 
-  doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
+  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
 
   function setPosition(lat, lon, zoom) {
     doSWF(lat, lon, zoom);
@@ -103,9 +105,10 @@
 
     resizeMap();
   }
+  
+  handleResize();
 
-  window.onresize = handleResize;
   window.onload = handleResize;
-
+  window.onresize = handleResize;
 </script>
 <% end %>