-<% if params['mlon'] and params['mlat'] %>
-<% marker = true %>
-<% mlon = params['mlon'] %>
-<% mlat = params['mlat'] %>
-<% lon = params['mlon'] %>
-<% lat = params['mlat'] %>
-<% zoom = params['zoom'] || '12' %>
-<script type="text/javascript">
- var mlat = <%= lat %>;
- var mlon = <%= lon %>;
-</script>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %>
-<% lon = @user.home_lon %>
-<% lat = @user.home_lat %>
-<% zoom = '10' %>
-<%else%>
-<% lon = params['lon'] || '-0.1' %>
-<% lat = params['lat'] || '51.5' %>
-<% zoom = params['zoom'] || '4' %>
-<% 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' %>
+<%= javascript_include_tag 'map.js' %>
+
+
+<script type="text/javascript" defer="defer">
+ <!--
+ var brokenContentSize = $("content").offsetWidth == 0;
+ var marker;
+ var map;
+
+ 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 %>
+ zoom = scaleToZoom(<%= params['scale'].to_f() %>);
+ <% end %>
+
+ setMapCenter(centre, zoom);
+ <% end %>
+
+ <% if !layers.nil? and !layers.empty? %>
+ setMapLayers("<%= layers %>");
+ <% end %>