X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/215958fa0f1819e4cfe594464ac996b1a18b2235..50ba6446022079b18326ab14a05ef322ee180100:/app/views/site/index.rhtml diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 85adb7ddb..bbd1a8a77 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,5 +1,5 @@ <% content_for :greeting do %> -<% if !@user.home_lon.nil? and !@user.home_lat.nil? %> +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> | <% end %> <% end %> @@ -88,20 +88,24 @@ map.setCenter(centre, zoom); <% end %> - <% if marker %> - marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>))); - <% end %> - <% if layers %> setMapLayers("<%= layers %>"); <% end %> + <% if marker %> + marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>))); + <% end %> + map.events.register("moveend", map, updateLocation); updateLocation(); handleResize(); } + function getPosition() { + return mercatorToLonLat(map.getCenter()); + } + function setPosition(lat, lon, zoom) { var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));