X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/97978ceeb9047ec6894b822ca947a466c2462988..f6a5d228163b781cd1138ba82d5c177656d0566b:/app/views/site/index.rhtml?ds=inline diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index 25cebdc23..0c6488129 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,44 +1,208 @@ -
-
- - -
-
+<% 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 %> -
-
- zoom out - zoom in +<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'key' %> +<%= render :partial => 'search' %> + +
+ + +
+ +
-
- -<% unless @user %> -
- We're trialing adverts to support the project. Login and they go away. +
+ + + + + + + + +
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 its 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?("_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 = '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') %> <% end %> +<% layers = h(params['layers']) %> +<% end %> + +<%= javascript_include_tag '/openlayers/OpenLayers.js' %> +<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> +<%= javascript_include_tag 'map.js' %> + + +