X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0cb97bd7d96030c07d9716c3d26d39bcd4f712ff..c29c7cd56ce1c747a1eb2b440c1ec98f0ea65c32:/app/views/site/index.rhtml?ds=sidebyside
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 482ed85b8..54f281727 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -21,64 +21,70 @@
-
-
-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.
- |
-
+
+
+ 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 %>
+<%
+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' %>
@@ -94,21 +100,27 @@ by the OpenStreetMap project and its 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 bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
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 = 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 %>
setMapCenter(centre, zoom);
<% end %>
@@ -157,8 +169,9 @@ by the OpenStreetMap project and its contributors.
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 = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers;
}