-<% session[:token] = @user.tokens.create.token unless session[:token] %>
-
-<% if params['mlon'] and params['mlat'] %>
-<% lon = params['mlon'] %>
-<% lat = params['mlat'] %>
-<% zoom = 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 = params['lon'] || '-0.1' %>
-<% lat = params['lat'] || '51.5' %>
-<% zoom = params['zoom'] || '12' %>
-<% end %>
-
-<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.
+<%
+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">
+ <%= t 'site.edit.flash_player_required' %>