X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a03c584a98f3e27eb9877121c2011393a250c9f7..c29c7cd56ce1c747a1eb2b440c1ec98f0ea65c32:/app/views/site/index.rhtml diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index edd755ddb..54f281727 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -8,69 +8,83 @@ <%= 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. -
+ + + + + + + + +
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?("location") %> -<% lon,lat,zoom,layers = cookies["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') %> -<% layers = h(params['layers']) %> -<% end %> -<% end %> +<% +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']) + box = true if params['box']=="yes" +end + +# Decide on a lat lon to initialise the map with. Various ways of doing this +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' %> @@ -86,29 +100,37 @@ by the OpenStreetMap project and it's contributors. function mapInit(){ map = createMap("map"); + <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %> + map.dataLayer = new OpenLayers.Layer("Data", { "visibility": false }); + map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData); + map.addLayer(map.dataLayer); + <% end %> + <% if bbox %> - var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>)); - var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>)); - var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat); + var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>); - map.zoomToExtent(bbox); + setMapExtent(bbox); + <% if box %> + // IE requires Vector layers be initialised on page load, and not under deferred script conditions + Event.observe(window, 'load', function() {addBoxToMap(bbox)}); + <% end %> <% else %> - var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>)); + var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); var zoom = <%= zoom %>; - <% if params['scale'] and params['scale'].length > 0 then %> + <% if params['scale'] and params['scale'].length > 0 then %> zoom = scaleToZoom(<%= params['scale'].to_f() %>); - <% end %> + <% end %> - map.setCenter(centre, zoom); + setMapCenter(centre, zoom); <% end %> - <% if layers %> + <% if !layers.nil? and !layers.empty? %> setMapLayers("<%= layers %>"); <% end %> <% if marker %> - marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>))); + marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)); <% end %> map.events.register("zoomend", map, updateKey); @@ -120,14 +142,22 @@ by the OpenStreetMap project and it's contributors. handleResize(); } + function toggleData() { + if (map.dataLayer.visibility) { + <%= remote_function :url => { :controller => 'browse', :action => 'start' } %> + } else { + closeSidebar(); + } + } + function getPosition() { - return mercatorToLonLat(map.getCenter()); + return getMapCenter(); } function setPosition(lat, lon, zoom) { - var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat)); + var centre = new OpenLayers.LonLat(lon, lat); - map.setCenter(centre, zoom); + setMapCenter(centre, zoom); if (marker) removeMarkerFromMap(marker); @@ -136,13 +166,14 @@ by the OpenStreetMap project and it's contributors. } function updateLocation() { - var lonlat = mercatorToLonLat(map.getCenter()); + var lonlat = getMapCenter(); var zoom = map.getZoom(); var layers = getMapLayers(); + var extents = getMapExtent(); - updatelinks(lonlat.lon, lonlat.lat, zoom, layers); + updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents); - document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers; + document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers; } function resizeContent() { @@ -182,5 +213,9 @@ by the OpenStreetMap project and it's contributors. window.onload = handleResize; window.onresize = handleResize; + + <% if params['action'] == 'export' %> + <%= remote_function :url => { :controller => 'export', :action => 'start' } %> + <% end %> // -->