cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak lat lon decision logic for the edit tab. made it more similar to logic in index, including using cookie

Browse source
This commit is contained in:
Harry Wood 2009-04-02 18:08:46 +00:00
parent bf0d8b3a5e
commit c321c026f2
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/views/site/edit.rhtml
View file

@ -24,20 +24,33 @@
<%
session[:token] = @user.tokens.create.token unless session[:token]
if params['mlon'] and params['mlat']
# 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'] || '14')
zoom = h(params['zoom'])
elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil?
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
zoom = '14'
else
lon = h(params['lon'] || 'null')
lat = h(params['lat'] || 'null')
zoom = h(params['zoom'] || '14')
#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">