X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5a66dbf907fb64921f55e02ef649b350486e7bf0..7e6a31510401d15d20935a92c6086ad40101397d:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 1e2fa3ad1..1b1a85d5b 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -4,34 +4,62 @@
 <% marker = true %>
 <% mlon = params['mlon'] %> 
 <% mlat = params['mlat'] %>
-<% lon =  params['mlon'] %>
-<% lat =  params['mlat']  %>
+<% end %>
+
+<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
+<% bbox = true %>
+<% minlon = params['minlon'] %>
+<% minlat = params['minlat'] %>
+<% maxlon = params['maxlon'] %>
+<% maxlat = params['maxlat'] %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon =  params['lon'] %>
+<% lat =  params['lat'] %>
+<% zoom =  params['zoom'] || '5' %>
+<% layers = params['layers'] %>
+<% elsif params['mlon'] and params['mlat'] %>
+<% lon = params['mlon'] %> 
+<% lat = params['mlat'] %>
 <% zoom =  params['zoom'] || '12' %>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% layers = 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%>
-<% lon =  params['lon'] || '-0.1' %>
-<% lat =  params['lat'] || '51.5' %>
-<% zoom =  params['zoom'] || '4' %>
+<% else %>
+<% lon =  '-0.1' %>
+<% lat =  '51.5' %>
+<% zoom =  params['zoom'] || '5' %>
+<% layers = params['layers'] %>
 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
-    <% unless @user %>
-    <script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
-
-    <% end %>
+<% unless @user %>
+<script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
+<% end %>
 
 
 <script type="text/javascript">
   <!--
-  var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
+  var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
   var map;
 
   function init(){
+    var map = createMap("map");
+
+    <% 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);
+
+    map.zoomToExtent(bbox);
+    <% else %>
     var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
     var zoom = <%= zoom %>;
 
@@ -39,26 +67,30 @@
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
-    var map = createMap("map", centre, zoom);
+    map.setCentre(centre, zoom);
+    <% end %>
 
     <% if marker %>
     addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
+    <% if layers %>
+    setMapLayers("<%= layers %>");
+    <% end %>
+
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     <% unless @user %>
-     if( window.location.host.match( /^www/ ) ) { 
-        mappam.register( map, '10011756636067178496', '1');
-      } else {
-        mappam.register( map, '6738410720121976832', '1');
-      }
-
+    if ( window.location.hostname == "www.openstreetmap.org" ) { 
+      mappam.register( map, '10011756636067178496', '1');
+    } else if( window.location.hostname == "openstreetmap.org" ) {
+      mappam.register( map, '6738410720121976832', '1');
+    }
     <% end %>
 
     document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
-    if ( ie6 ) {
+    if ( ie ) {
       handleResize();
     }
   }        
@@ -66,8 +98,11 @@
   function updateLocation() {
     var lonlat = mercatorToLonLat(map.getCenter());
     var zoom = map.getZoom();
+    var layers = getMapLayers();
+
+    updatelinks(lonlat.lon, lonlat.lat, zoom, layers);
 
-    updatelinks(lonlat.lon, lonlat.lat, zoom);
+    document.cookie = "location=" + lonlat.lon + "," + lonlat.lat + "," + zoom + "," + layers;
   }
 
   function getStyle( el, property ) {
@@ -89,6 +124,7 @@
     var bottom = getStyle( el, 'bottom' );
     var right = getStyle( el, 'right' );
     var width = el.old_width;
+    var height;
     if( ! width ) {
         width = getStyle( el, 'width' );
     }
@@ -100,7 +136,7 @@
     if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
       if( typeof( window.innerWidth ) == 'number' ) {
           pwidth = window.innerWidth;
-          height = window.innerHeight;
+          pheight = window.innerHeight;
       } else if( document.documentElement &&
           ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
           pwidth = document.documentElement.clientWidth;
@@ -125,12 +161,10 @@
     }
     map.updateSize();
     el.style.display = 'none';
-    setTimeout( function() {
-        el.style.display = '';
-        }, 200 );
+    setTimeout( function() { el.style.display = ''; }, 200 );
   }
 
-  if ( ie6 ) {
+  if ( ie ) {
     window.onresize = handleResize;
   }