X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4358a6adcb2c9d55f2c2fcf53c958ed388cbc31c..4d1633585feddb414a967f0df83be5c63cc0ffad:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 4b187c099..c182a924d 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -4,16 +4,23 @@
 <% marker = true %>
 <% mlon = params['mlon'] %> 
 <% mlat = params['mlat'] %>
-<% lon =  params['mlon'] %>
-<% lat =  params['mlat']  %>
+<% end %>
+
+<% if params['lon'] and params['lat'] %>
+<% lon =  params['lon'] %>
+<% lat =  params['lat'] %>
+<% zoom =  params['zoom'] || '4' %>
+<% 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? %> 
+<% elsif @user %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
-<%else%>
-<% lon =  params['lon'] || '-0.1' %>
-<% lat =  params['lat'] || '51.5' %>
+<% else %>
+<% lon =  '-0.1' %>
+<% lat =  '51.5' %>
 <% zoom =  params['zoom'] || '4' %>
 <% end %>
 
@@ -27,7 +34,7 @@
 
 <script type="text/javascript">
   <!--
-  var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
+  var ie = navigator.appName.indexOf("Microsoft Internet Explorer") != -1;
   var map;
 
   function init(){
@@ -56,7 +63,7 @@
     <% end %>
 
     document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
-    if ( ie6 ) {
+    if ( ie ) {
       handleResize();
     }
   }        
@@ -87,6 +94,7 @@
     var bottom = getStyle( el, 'bottom' );
     var right = getStyle( el, 'right' );
     var width = el.old_width;
+    var height;
     if( ! width ) {
         width = getStyle( el, 'width' );
     }
@@ -98,7 +106,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;
@@ -123,12 +131,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;
   }