allow the user to pass in a gpx and a zoom

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

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index e341305f591cad809733c2ca1e14e21f4ceb257c..d8f556d9f35269034f6ac7d12ddcdd4d01c7b1cc 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -8,8 +8,8 @@
 </p>
 <% elsif !@user.data_public? %>
 <p>You haven't set your edits to be public.</p>
-<p>You can't use the online editor unless you do so. You can set your edits as public from your 
-<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.</p>
+<p>You can no longer edit the map unless you do so. You can set your edits as public from your 
+<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}%>.</p>
 <p>(<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">Find out why this is the case.</a>)</p>
 <% else %>
 <% content_for :greeting do %>
@@ -36,6 +36,10 @@ elsif params['mlon'] and params['mlat']
        zoom =  h(params['zoom'])
        
 elsif params['gpx']
+        # The user may pass a gpx and zoom
+       if params['zoom']
+          zoom = h(params['zoom'])
+       end
        #use gpx id to locate (dealt with below)
        
 elsif cookies.key?("_osm_location")
@@ -75,12 +79,15 @@ zoom='14' if zoom.nil?
        }
   }
 
+  function markChanged(a) { changesaved=a; }
+
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
     if (lat) { fo.addVariable('lat',lat); }
     if (lon) { fo.addVariable('long',lon); }
+    if (zoom) { fo.addVariable('zoom',zoom); }
     <% if params['gpx']  %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %>
     <% if params['way']  %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %>
     <% if params['node'] %>fo.addVariable('node','<%= h(params['node']) %>');<% end %>