X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2b6892a4553eeaa8d601737dee440eba0c6d6a6..c1299fbb35d99287e25d7c7573bb467fc6b9ac5f:/app/views/site/index.rhtml diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index fb5327b81..e88643588 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,76 +1,183 @@ -
-
- - -
+<% content_for :greeting do %> +<% 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 %> + +<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'key' %> +<%= render :partial => 'search' %> + +
+ +
+ +
+ + + + + + + +
http://creativecommons.org/licenses/by-sa/2.0/http://openstreetmap.org/
+Licensed under the Creative Commons Attribution-Share Alike 2.0 license +by the OpenStreetMap project and it's contributors. +
-
+<% if params['mlon'] and params['mlat'] %> +<% marker = true %> +<% mlon = h(params['mlon']) %> +<% mlat = h(params['mlat']) %> +<% end %> + +<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %> +<% bbox = true %> +<% minlon = h(params['minlon']) %> +<% minlat = h(params['minlat']) %> +<% maxlon = h(params['maxlon']) %> +<% maxlat = h(params['maxlat']) %> +<% end %> + +<% if params['lon'] and params['lat'] %> +<% lon = h(params['lon']) %> +<% lat = h(params['lat']) %> +<% zoom = h(params['zoom'] || '5') %> +<% layers = h(params['layers']) %> +<% elsif params['mlon'] and params['mlat'] %> +<% lon = h(params['mlon']) %> +<% lat = h(params['mlat']) %> +<% zoom = h(params['zoom'] || '12') %> +<% layers = h(params['layers']) %> +<% elsif cookies.key?("location") %> +<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %> +<% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> +<% lon = @user.home_lon %> +<% lat = @user.home_lat %> +<% zoom = '10' %> +<% else %> +<% session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] %> +<% if session[:location] %> +<% bbox = true %> +<% minlon = session[:location][:minlon] %> +<% minlat = session[:location][:minlat] %> +<% maxlon = session[:location][:maxlon] %> +<% maxlat = session[:location][:maxlat] %> +<% else %> +<% lon = '-0.1' %> +<% lat = '51.5' %> +<% zoom = h(params['zoom'] || '5') %> +<% layers = h(params['layers']) %> +<% end %> +<% end %> + + + +<%= javascript_include_tag 'map.js' %> + - + function getPosition() { + return mercatorToLonLat(map.getCenter()); + } + function setPosition(lat, lon, zoom) { + var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat)); - -<% unless @user %> -
- We're trialing adverts to support the project. Login and they go away. -
- <% end %> + if (marker) + removeMarkerFromMap(marker); - + $("map").style.left = (sidebar_width) + "px"; + $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px"; + $("map").style.height = ($("content").offsetHeight - 2) + "px"; + + map.setCenter(centre, zoom); + } + + function handleResize() { + if (brokenContentSize) { + resizeContent(); + } + + resizeMap(); + } + + window.onresize = handleResize; + window.onload = init; +// --> +