X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/62a1ec47483803a32c038fb2907afdf45a61b5ee..a3a792e13772282c006556081c65e12e37ad273b:/app/views/site/edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 9c3c78fda..0080fa8d7 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -2,14 +2,14 @@
 <p>The OpenStreetMap database is currently offline while
    essential database maintenance work is carried out.
 </p>
-<% elsif OSM_STATUS == :api_readonly %>
+<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
 <p>The OpenStreetMap database is currently in read-only mode while
    essential database maintenance work is carried out.
 </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 %>
@@ -21,21 +21,37 @@
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'search' %>
 
-<% 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'] || '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 %>
+<%
+session[:token] = @user.tokens.create.token unless session[:token]
+
+# Decide on a lat lon to initialise potlatch with. Various ways of doing this
+if params['lon'] and params['lat']
+	lon =  h(params['lon']) 
+	lat =  h(params['lat']) 
+	zoom =  h(params['zoom'])
+
+elsif params['mlon'] and params['mlat'] 
+	lon =  h(params['mlon']) 
+	lat =  h(params['mlat']) 
+	zoom =  h(params['zoom'])
+	
+elsif params['gpx']
+	#use gpx id to locate (dealt with below)
+	
+elsif cookies.key?("_osm_location")
+	lon,lat,zoom,layers = cookies["_osm_location"].split("|")
+	
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
+	lon =  @user.home_lon
+	lat =  @user.home_lat
+
+else
+	#catch all.  Do nothing.  lat=nil, lon=nil
+	#Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
+end
+
+zoom='14' if zoom.nil?
+%>
 
 <div id="map">
 	You need a Flash player to use Potlatch, the
@@ -55,10 +71,12 @@
   
   window.onbeforeunload=function() {
 	if (!changesaved && !winie) {
-	    return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
+	    return "You have unsaved changes.";
 	}
   }
 
+  function markChanged(a) { changesaved=a; }
+
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
     fo.addVariable('scale',sc);