Allow the map centre and marker position to be set independently.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d0c9c2e296d22e4fa68739ffc7eeae6b33e81a1c..c182a924ddc3c94dd8a274013001b9f15439bcd1 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -4,16 +4,23 @@
 <% marker = true %>
 <% mlon = params['mlon'] %> 
 <% mlat = params['mlat'] %>
 <% 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' %>
 <% 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' %>
 <% 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 %>
 
 <% zoom =  params['zoom'] || '4' %>
 <% end %>
 


@@ -27,7 +34,7 @@
 
 <script type="text/javascript">
   <!--
 
 <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;
 
   function init(){


@@ -56,7 +63,7 @@
     <% end %>
 
     document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
     <% end %>
 
     document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';

-    if ( ie6 ) {
+    if ( ie ) {

       handleResize();
     }
   }        
       handleResize();
     }
   }        


@@ -124,12 +131,10 @@
     }
     map.updateSize();
     el.style.display = 'none';
     }
     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;
   }
 
     window.onresize = handleResize;
   }